diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-07-28 17:36:49 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-07-28 17:36:49 +0200 |
| commit | cfc7f8308f5e1756d1ea7b2fadd317821442d16c (patch) | |
| tree | 64e44b7423e4ef07d1c954119ef0608ec1c6175e | |
| parent | ea0d5d34acc75e494374d1dc131e79915c039e06 (diff) | |
| parent | c74f0f0cabc774b1dc1719b2ebc7409179d26ca4 (diff) | |
| download | volse-hubzilla-cfc7f8308f5e1756d1ea7b2fadd317821442d16c.tar.gz volse-hubzilla-cfc7f8308f5e1756d1ea7b2fadd317821442d16c.tar.bz2 volse-hubzilla-cfc7f8308f5e1756d1ea7b2fadd317821442d16c.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
| -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 4a72bb680..2941fa32a 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -903,7 +903,7 @@ function photos_content(&$a) { $album = hex2bin($datum); $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' - $sql_extra GROUP BY `resource-id`", + AND `scale` < 4 $sql_extra GROUP BY `resource-id`", intval($owner_uid), dbesc($album) ); @@ -913,7 +913,7 @@ function photos_content(&$a) { } $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", + AND `scale` < 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($owner_uid), dbesc($album), intval($a->pager['start']), |