aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorTobias Hößl <tobias@hoessl.eu>2012-03-11 11:27:47 +0000
committerTobias Hößl <tobias@hoessl.eu>2012-03-11 11:27:47 +0000
commit4df08433c6dcf5c88945e064da74188c805c5d68 (patch)
treeee482f76941fbb26b77a53147def83b32c8eaa7b /mod/network.php
parent635958e11da2f5a0d587b66968453064c2d41f13 (diff)
parent50863a19eb9c74ca336df609dbb9dfe5a9c39a31 (diff)
downloadvolse-hubzilla-4df08433c6dcf5c88945e064da74188c805c5d68.tar.gz
volse-hubzilla-4df08433c6dcf5c88945e064da74188c805c5d68.tar.bz2
volse-hubzilla-4df08433c6dcf5c88945e064da74188c805c5d68.zip
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'mod/network.php')
-rwxr-xr-xmod/network.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php
index e65180222..aabd9095f 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -403,7 +403,8 @@ function network_content(&$a, $update = 0) {
if(count($r)) {
$a->set_pager_total($r[0]['total']);
- $a->set_pager_itemspage(40);
+ $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']));
}