diff options
| author | Friendika <info@friendika.com> | 2011-02-21 13:27:03 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-21 13:27:03 -0800 |
| commit | 079e63bba942e150ddd2baf91149936d1b880697 (patch) | |
| tree | e6d33a7b073a375d294cf1e44670233046e5deaf /mod/photos.php | |
| parent | 0a7b3c111e0b137b91a050538e16ccbb5f82f859 (diff) | |
| parent | f5557763d257e62d6ab074659fa9a0ea221f73a4 (diff) | |
| download | volse-hubzilla-079e63bba942e150ddd2baf91149936d1b880697.tar.gz volse-hubzilla-079e63bba942e150ddd2baf91149936d1b880697.tar.bz2 volse-hubzilla-079e63bba942e150ddd2baf91149936d1b880697.zip | |
Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/photos.php b/mod/photos.php index 27cb1beb1..d4835ba5e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -831,7 +831,7 @@ function photos_content(&$a) { $a->set_pager_itemspage(20); } - $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -873,7 +873,8 @@ function photos_content(&$a) { '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', - '$imgalt' => $rr['filename'] + '$imgalt' => $rr['filename'], + '$desc'=> $rr['desc'] )); } |