diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-17 15:15:02 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-17 15:15:02 -0800 |
| commit | 96427a23a3523daf2c1966fe1b8a6e119e797e50 (patch) | |
| tree | a7aaea69271817bbc8f78396f0d98052ca52d3f3 /mod/photos.php | |
| parent | bcaa32a83a965f111bfc2ba085a59857a4fa0c2d (diff) | |
| parent | e59f7cc198fb038cd8344c2d403b423d57300a96 (diff) | |
| download | volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.gz volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.tar.bz2 volse-hubzilla-96427a23a3523daf2c1966fe1b8a6e119e797e50.zip | |
Merge branch 'master' of https://github.com/habeascodice/red
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/photos.php b/mod/photos.php index a2e5d1c1b..ad95d6a88 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'), |