From fec0c71445db41c5099ff4a5ca22c1db23b1568c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 10 Sep 2013 21:52:13 +0200 Subject: make /channel respect "Maximum number of conversations to load at any time" setting like /network does. --- mod/channel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mod') 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) { -- cgit v1.2.3 From 517baa86a3372f1bdb09f98a85c8f781365bcb1f Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 11 Sep 2013 00:29:27 +0200 Subject: No need to add name_updated twice in zfinger response --- mod/zfinger.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/zfinger.php b/mod/zfinger.php index 320f0ca71..36c1cc493 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -130,7 +130,6 @@ function zfinger_init(&$a) { $ret['photo_updated'] = $e['xchan_photo_date']; $ret['url'] = $e['xchan_url']; $ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']); - $ret['name_updated'] = $e['xchan_name_date']; $ret['target'] = $ztarget; $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; @@ -250,4 +249,4 @@ function zfinger_init(&$a) { } json_return_and_die($ret); -} \ No newline at end of file +} -- cgit v1.2.3