diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
| commit | 51bcfb649fe2a20c9b8b1e66bc59e39da80d326b (patch) | |
| tree | ef804b85942d5774a2c680d9696b65f3dc88d417 /mod/photos.php | |
| parent | f3005918aff04fc435d0f526bf235bd95468294c (diff) | |
| parent | f057cc3a70dd7435b4e9e8a2a07406f0f25e3f2a (diff) | |
| download | volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.gz volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.bz2 volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php index f29c39386..e811ca395 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -766,9 +766,10 @@ function photos_content(&$a) { intval($owner_uid), dbesc($album) ); - if(count($r)) + if(count($r)) { $a->set_pager_total(count($r)); - + $a->set_pager_itemspage(20); + } $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", @@ -817,6 +818,8 @@ function photos_content(&$a) { } $o .= '<div id="photo-album-end"></div>'; + $o .= paginate($a); + return $o; } @@ -1107,9 +1110,10 @@ function photos_content(&$a) { intval($a->data['user']['uid']), dbesc( t('Contact Photos')) ); - if(count($r)) + if(count($r)) { $a->set_pager_total(count($r)); - + $a->set_pager_itemspage(20); + } $r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' @@ -1147,5 +1151,6 @@ function photos_content(&$a) { } $o .= '<div id="photo-top-end"></div>'; } + $o .= paginate($a); return $o; } |