diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-10 00:15:29 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-10 00:15:29 -0500 |
| commit | 665ad7e6600778c446aa9c5fc48ed32b309e64a7 (patch) | |
| tree | dc899a136a2b9666f8f44bfec5e515ea7198ff29 /mod/network.php | |
| parent | 686fe47b8892d3c3cd82b77b77adf3c990a7c160 (diff) | |
| parent | d50a839c0420634ec5756c9f2f95c26484b63b4d (diff) | |
| download | volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.tar.gz volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.tar.bz2 volse-hubzilla-665ad7e6600778c446aa9c5fc48ed32b309e64a7.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
spec directory
allow user to set number of items to show on network page
revup
* master:
Diffstat (limited to 'mod/network.php')
| -rwxr-xr-x | mod/network.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index 27c6e315b..b04a7b489 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'])); } |