diff options
| author | friendica <info@friendica.com> | 2014-09-11 15:51:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-11 15:51:10 -0700 |
| commit | d2ce5f3b80b0e140ed3d86e33fcf4eeb0e2f40bf (patch) | |
| tree | 0e599447c5b7b9eeb02b5ddd0eec0db3bcde2da6 | |
| parent | 5547222da236c29fcb7bf6e3b6d8ed7421e1c57f (diff) | |
| parent | 1f16bad9d97d63bfaf6f9f980de9d7a96c09ba24 (diff) | |
| download | volse-hubzilla-d2ce5f3b80b0e140ed3d86e33fcf4eeb0e2f40bf.tar.gz volse-hubzilla-d2ce5f3b80b0e140ed3d86e33fcf4eeb0e2f40bf.tar.bz2 volse-hubzilla-d2ce5f3b80b0e140ed3d86e33fcf4eeb0e2f40bf.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | mod/photos.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php index 866d8c275..f2df894c0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(30); + $a->set_pager_itemspage(60); } if($_GET['order'] === 'posted') @@ -753,12 +753,15 @@ function photos_content(&$a) { } } if($_REQUEST['aj']) { - if(! $r) + if(! $r) { $ajaxout .= '<div id="content-complete"></div>'; + echo $ajaxout; + killme(); + } echo '<div id="photo-album-contents-' . $a->pager['page'] . '">'; echo $ajaxout; - echo '<div>'; + echo '</div>'; echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>'; killme(); } @@ -1165,7 +1168,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(30); + $a->set_pager_itemspage(60); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` |