Upstream merge

2013-09-15 03:21:19 +02:00
parent 496f869157 aefb0f8233
commit 4132d1cd8e
92 changed files with 3733 additions and 2718 deletions
--- 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) {