aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-12-12 14:16:34 -0800
committerzotlabs <mike@macgirvin.com>2017-12-12 14:18:34 -0800
commit494ce9b87230c1745ec9da8cf60fa448cac4f187 (patch)
tree1db2cc88217bba48b39c281b8a42d293e069fc24
parenta984cd2b27a7976c8d727efc5012f39b6b554bc1 (diff)
downloadvolse-hubzilla-494ce9b87230c1745ec9da8cf60fa448cac4f187.tar.gz
volse-hubzilla-494ce9b87230c1745ec9da8cf60fa448cac4f187.tar.bz2
volse-hubzilla-494ce9b87230c1745ec9da8cf60fa448cac4f187.zip
hubzilla #475 continued - show photos in root folder. Part of Andrew's fix for this wasn't in my repository and hopefully won't conflict; as it appears to have been lost somewhere. It also needed a small change to the folder permissions check.
-rw-r--r--Zotlabs/Module/Embedphotos.php2
-rw-r--r--include/attach.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
index c92af27d6..15cc68d7f 100644
--- a/Zotlabs/Module/Embedphotos.php
+++ b/Zotlabs/Module/Embedphotos.php
@@ -83,7 +83,7 @@ class Embedphotos extends \Zotlabs\Web\Controller {
return '';
if($args['album'])
- $album = $args['album'];
+ $album = (($args['album'] === '/') ? '' : $args['album']);
if($args['title'])
$title = $args['title'];
diff --git a/include/attach.php b/include/attach.php
index 88b6fa8e7..e94454905 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -308,6 +308,11 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash) {
$hash = $folder_hash;
$result = false;
+ if(! $folder_hash) {
+ return perm_is_allowed($uid,$ob_hash,'view_storage');
+ }
+
+
do {
$r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra",
dbesc($hash),