mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 21:15:14 +00:00
Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
b8fcfc7698
3 changed files with 9 additions and 1 deletions
|
@ -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'];
|
||||
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -1802,3 +1802,6 @@ dl.bb-dl > dd > li {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
.caption-visible {
|
||||
max-height: 75%;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue