diff options
author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
---|---|---|
committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-09-15 03:21:19 +0200 |
commit | 4132d1cd8e59d2cf84d7578ac700c65d7954edd6 (patch) | |
tree | 5586bb1bf97ad9e457de2eacb298d28e22c854ee /mod/channel.php | |
parent | 496f869157ab76139d14a3c67fd8276ee6557517 (diff) | |
parent | aefb0f823353d15a281d3c94ec6fc044e1b62580 (diff) | |
download | volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.gz volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.tar.bz2 volse-hubzilla-4132d1cd8e59d2cf84d7578ac700c65d7954edd6.zip |
Upstream merge
Diffstat (limited to 'mod/channel.php')
-rw-r--r-- | mod/channel.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/channel.php b/mod/channel.php index 2544018f8..5a66f5e07 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -186,9 +186,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) { |