diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
| commit | ce28760c2a7319f3cdc25c39a62582b722e91006 (patch) | |
| tree | 802f64d3988fc14a277c79ee5192693a4202b502 /mod/photos.php | |
| parent | 438cb1d7e0f1518dd35a3a377dfd9a9fd885f80c (diff) | |
| parent | 87c8cf489210136958d2e0b44e4c3ca48c1ff8af (diff) | |
| download | volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.gz volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.bz2 volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.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], |