diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-18 01:53:04 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-18 01:53:04 -0700 |
| commit | f2fefb91d5f823385105fe693d0d82d7e236b511 (patch) | |
| tree | b875fdb1c49406558de6c30efeee5638f7e3edc8 /mod/photos.php | |
| parent | cc95c3e9c81a11d96b6670180f53490ec30e0324 (diff) | |
| download | volse-hubzilla-f2fefb91d5f823385105fe693d0d82d7e236b511.tar.gz volse-hubzilla-f2fefb91d5f823385105fe693d0d82d7e236b511.tar.bz2 volse-hubzilla-f2fefb91d5f823385105fe693d0d82d7e236b511.zip | |
change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos.
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/photos.php b/mod/photos.php index f48603d71..cd293b39d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -770,7 +770,7 @@ function photos_content(&$a) { // fetch image, item containing image, then comments - $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' + $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' $sql_extra ORDER BY `scale` ASC ", intval($owner_uid), dbesc($datum) @@ -1147,7 +1147,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $link_item['id'], //$ph[0]['id'], + '$id' => $ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lockstate[1], |