From a984cd2b27a7976c8d727efc5012f39b6b554bc1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 12 Dec 2017 13:50:25 -0800 Subject: hubzilla issue #475, item 3 --- view/theme/redbasic/css/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d88340a4e..c1073c0ab 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1810,4 +1810,8 @@ dl.bb-dl > dd > li { #cloud-index td { width: auto; overflow: hidden; -} \ No newline at end of file +} + +.caption-visible { + max-height: 75%; +} -- cgit v1.2.3 From 494ce9b87230c1745ec9da8cf60fa448cac4f187 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 12 Dec 2017 14:16:34 -0800 Subject: 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. --- Zotlabs/Module/Embedphotos.php | 2 +- include/attach.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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), -- cgit v1.2.3