From fec0c71445db41c5099ff4a5ca22c1db23b1568c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 10 Sep 2013 21:52:13 +0200 Subject: make /channel respect "Maximum number of conversations to load at any time" setting like /network does. --- mod/channel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 5d3855269..652084cf0 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -185,9 +185,8 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - - $a->set_pager_itemspage(40); - + $itemspage = get_pconfig(local_user(),'system','itemspage'); + $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { -- cgit v1.2.3