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

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.

Browse Source
This commit is contained in:
zotlabs
2017-12-12 14:16:34 -08:00
parent a984cd2b27
commit 494ce9b872
2 changed files with 6 additions and 1 deletions
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),