diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
| commit | d9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch) | |
| tree | 86a91ec7a556310400c2eb26d45bbeb108486b36 /include/iquery.php | |
| parent | 2cb2896916ce98f16b891634fddcbd403c55d95f (diff) | |
| parent | e9b5b0f0b424930b87708080c4e6ce671016177b (diff) | |
| download | volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2 volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'include/iquery.php')
| -rw-r--r-- | include/iquery.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/iquery.php b/include/iquery.php index 03264de28..0d51134a4 100644 --- a/include/iquery.php +++ b/include/iquery.php @@ -9,8 +9,8 @@ function network_query($a,$arr) { $ordering = (($arr['order'] === 'post') ? "`created`" : "`commented`") . " DESC "; - $itemspage = get_pconfig($arr['uid'],'system','itemspage_network'); - $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); + $itemspage = get_pconfig($arr['uid'],'system','itemspage'); + $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 40)); $pager_sql = ((intval($arr['update'])) ? '' : sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']))); |