diff options
| -rw-r--r-- | mod/channel.php | 5 | ||||
| -rw-r--r-- | mod/zfinger.php | 3 | ||||
| -rwxr-xr-x | view/tpl/admin_logs.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_plugins_details.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_summary.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_users.tpl | 2 |
8 files changed, 9 insertions, 11 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 +} diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index e5412429f..3d2adc660 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/logs" method="post"> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 01c178c3e..729ba5dc8 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 47c33bec3..f72142e41 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class = "generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 32c5db8fc..d0a5254fe 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -34,7 +34,7 @@ }); }); </script> -<div id='adminpage'> +<div id="adminpage" class="generic-content-wrapper"> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/site" method="post"> diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 88d87c35d..d3665626f 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -<div id='adminpage'> +<div class="generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <dl> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 86389e9f2..770df7eba 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } </script> -<div id='adminpage'> +<div class = "generic-content-wrapper" id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/users" method="post"> |