harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-09-11 15:51:10 -07:00
commit d2ce5f3b80
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/photos.php
View File

@ -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`