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

make alt_pager the network page default - at least until we get rid of the network page

Browse Source
This commit is contained in:
friendica 2012-07-16 19:39:13 -07:00
parent 07c31d547f
commit 43a673c11e
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mod/network.php
View File

@ -579,23 +579,9 @@ function network_content(&$a, $update = 0) {
} }
else { else {
if(! get_pconfig(local_user(),'system','alt_pager')) { $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
$r = q("SELECT COUNT(*) AS `total` $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra2 $sql_extra3
$sql_extra $sql_nets ",
intval($_SESSION['uid'])
);
if(count($r)) {
$a->set_pager_total($r[0]['total']);
}
}
$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
$a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
} }
$simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); $simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
@ -709,12 +695,7 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$items,$mode,$update); $o .= conversation($a,$items,$mode,$update);
if(! $update) { if(! $update) {
if(! get_pconfig(local_user(),'system','alt_pager')) { $o .= alt_pager($a,count($items));
$o .= paginate($a);
}
else {
$o .= alt_pager($a,count($items));
}
} }
return $o; return $o;

22
mod/search_ac.php
View File

@ -46,18 +46,20 @@ function search_ac_init(&$a){
$x['data'][] = intval($g['id']); $x['data'][] = intval($g['id']);
} }
} }
else {
$r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1 $r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1
$people_sql_extra $people_sql_extra
ORDER BY `name` ASC " ORDER BY `name` ASC "
); );
if(count($r)) { if(count($r)) {
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $g['photo']; $x['photos'][] = $g['photo'];
$x['links'][] = $g['url']; $x['links'][] = $g['url'];
$x['suggestions'][] = '@' . $g['name']; $x['suggestions'][] = '@' . $g['name'];
$x['data'][] = intval($g['id']); $x['data'][] = intval($g['id']);
}
} }
} }