diff options
| author | friendica <info@friendica.com> | 2013-09-10 13:49:28 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-10 13:49:28 -0700 |
| commit | b304267a09c5f4a2c36a0f3ed0f2d2b81d4c3a5c (patch) | |
| tree | 57d24e904d1ddd2e3a68e9b8ffa6ddec93e3909d | |
| parent | dfd91889ad1cb6460cebbc1478a187ca94c3dd83 (diff) | |
| parent | fec0c71445db41c5099ff4a5ca22c1db23b1568c (diff) | |
| download | volse-hubzilla-b304267a09c5f4a2c36a0f3ed0f2d2b81d4c3a5c.tar.gz volse-hubzilla-b304267a09c5f4a2c36a0f3ed0f2d2b81d4c3a5c.tar.bz2 volse-hubzilla-b304267a09c5f4a2c36a0f3ed0f2d2b81d4c3a5c.zip | |
Merge pull request #127 from git-marijus/master
make /channel respect "Maximum number of conversations to load at any time" setting like /network does.
| -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 5d3855269..652084cf0 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -185,9 +185,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) { |