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

19
mod/network.php
View File

@ -579,20 +579,6 @@ function network_content(&$a, $update = 0) {
} }
else { else {
if(! get_pconfig(local_user(),'system','alt_pager')) {
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
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'); $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
$a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
@ -709,13 +695,8 @@ 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 .= paginate($a);
}
else {
$o .= alt_pager($a,count($items)); $o .= alt_pager($a,count($items));
} }
}
return $o; return $o;
} }

2
mod/search_ac.php
View File

@ -46,6 +46,7 @@ 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
@ -60,6 +61,7 @@ function search_ac_init(&$a){
$x['data'][] = intval($g['id']); $x['data'][] = intval($g['id']);
} }
} }
}
$r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc", $r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc",
intval(TERM_HASHTAG) intval(TERM_HASHTAG)