diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-18 06:48:29 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-18 06:48:29 +0100 |
| commit | 0d232c612b71ba28dba234415185ecfb45a80695 (patch) | |
| tree | 5594cbe27017dd5b640eb9282f816ac6b7066d13 /include/widgets.php | |
| parent | 545dc5cf65fef823a9ca8a5bcde6e346d4503d4c (diff) | |
| parent | 68da4d90dcbda1240ae014768a66a164fd5d2b36 (diff) | |
| download | volse-hubzilla-0d232c612b71ba28dba234415185ecfb45a80695.tar.gz volse-hubzilla-0d232c612b71ba28dba234415185ecfb45a80695.tar.bz2 volse-hubzilla-0d232c612b71ba28dba234415185ecfb45a80695.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/widgets.php')
| -rw-r--r-- | include/widgets.php | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/widgets.php b/include/widgets.php index fc6fee2ef..2b1fb2859 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1238,6 +1238,23 @@ function widget_album($args) { if($args['title']) $title = $args['title']; + /** + * This may return incorrect permissions if you have multiple directories of the same name. + * It is a limitation of the photo table using a name for a photo album instead of a folder hash + */ + + if($album) { + $x = q("select hash from attach where filename = '%s' and uid = %d limit 1", + dbesc($album), + intval($owner_uid) + ); + if($x) { + $y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']); + if(! $y) + return ''; + } + } + $order = 'DESC'; $r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN |