harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-12-13 11:38:42 +01:00
commit b8fcfc7698
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Embedphotos.php
View File

@ -83,7 +83,7 @@ class Embedphotos extends \Zotlabs\Web\Controller {
return ''; return '';
if($args['album']) if($args['album'])
$album = $args['album']; $album = (($args['album'] === '/') ? '' : $args['album']);
if($args['title']) if($args['title'])
$title = $args['title']; $title = $args['title'];

5
include/attach.php
View File

@ -308,6 +308,11 @@ function attach_can_view_folder($uid,$ob_hash,$folder_hash) {
$hash = $folder_hash; $hash = $folder_hash;
$result = false; $result = false;
if(! $folder_hash) {
return perm_is_allowed($uid,$ob_hash,'view_storage');
}
do { do {
$r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra", $r = q("select folder from attach where hash = '%s' and uid = %d $sql_extra",
dbesc($hash), dbesc($hash),

3
view/theme/redbasic/css/style.css
View File

@ -1802,3 +1802,6 @@ dl.bb-dl > dd > li {
overflow: hidden; overflow: hidden;
} }
.caption-visible {
max-height: 75%;
}