diff options
| author | friendica <info@friendica.com> | 2013-09-10 17:12:48 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-10 17:12:48 -0700 |
| commit | 7ada499ca9a1424a59204d87edb5856f88a79b59 (patch) | |
| tree | af1b87755abe9c5276a07869ee5a7d5729d71fd7 /mod | |
| parent | 72f562c190630e69fa5a223855cd6f3a3bc66e49 (diff) | |
| parent | 5aaf8b8e9940d99befd00619238cd20c3894e5a9 (diff) | |
| download | volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.gz volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.tar.bz2 volse-hubzilla-7ada499ca9a1424a59204d87edb5856f88a79b59.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 5 | ||||
| -rw-r--r-- | mod/zfinger.php | 3 |
2 files changed, 3 insertions, 5 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) { 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 +} |