diff options
| author | zottel <github@zottel.net> | 2015-09-19 20:11:59 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-19 20:11:59 +0200 |
| commit | 032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5 (patch) | |
| tree | 579fecd828a42463c0a2bf2a99ff95e316610201 /mod/photos.php | |
| parent | 4d05d477f8363aceb08d533c79d048b4e7be1fa3 (diff) | |
| parent | 63146821d7f28107ca34fbe581dcc3abf6fd49fe (diff) | |
| download | volse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.tar.gz volse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.tar.bz2 volse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.zip | |
Merge remote-tracking branch 'upstream/master'
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], |