aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-15 14:04:20 -0800
committerfriendica <info@friendica.com>2014-11-15 14:04:20 -0800
commit7e58bfe93169fb1ab20974967be7f61021a348aa (patch)
treef71fe64aca0b3034fc6f985b449343c4c5852830 /mod
parentf299922df3fe1bdb55feca0e20ae3111ab3317b9 (diff)
parent8b1e83128a1a9db1c5438dadb407bed18f168e0c (diff)
downloadvolse-hubzilla-7e58bfe93169fb1ab20974967be7f61021a348aa.tar.gz
volse-hubzilla-7e58bfe93169fb1ab20974967be7f61021a348aa.tar.bz2
volse-hubzilla-7e58bfe93169fb1ab20974967be7f61021a348aa.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/photos.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 95fa162c9..ab1e4b48a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1175,7 +1175,7 @@ function photos_content(&$a) {
$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.album, p.scale, p.created FROM photo p INNER JOIN
(SELECT resource_id, max(scale) scale FROM photo
WHERE uid=%d AND album != '%s' AND album != '%s'
- AND (photo_flags = %d or photo_flags = %d ) group by resource_id) ph
+ AND (photo_flags = %d or photo_flags = %d ) $sql_extra group by resource_id) ph
ON (p.resource_id = ph.resource_id and p.scale = ph.scale) ORDER by p.created DESC LIMIT %d OFFSET %d",
intval($a->data['channel']['channel_id']),
dbesc('Contact Photos'),