diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-12-13 11:38:42 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-12-13 11:38:42 +0100 |
| commit | b8fcfc76986637872459fd7dc95bdecb088e83f3 (patch) | |
| tree | 9914bd5b66a7c2f808c1f1957f4cffe21c1442ca | |
| parent | 7a7bfd9de75abf6e8f601102b6d5f80396a8b3a4 (diff) | |
| parent | 494ce9b87230c1745ec9da8cf60fa448cac4f187 (diff) | |
| download | volse-hubzilla-b8fcfc76986637872459fd7dc95bdecb088e83f3.tar.gz volse-hubzilla-b8fcfc76986637872459fd7dc95bdecb088e83f3.tar.bz2 volse-hubzilla-b8fcfc76986637872459fd7dc95bdecb088e83f3.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Module/Embedphotos.php | 2 | ||||
| -rw-r--r-- | include/attach.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 |
3 files changed, 9 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), diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e46d31ef8..b0a109c92 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1802,3 +1802,6 @@ dl.bb-dl > dd > li { overflow: hidden; } +.caption-visible { + max-height: 75%; +} |