Merge remote-tracking branch 'mike/master' into dev

This commit is contained in:
Mario Vavti
2018-02-25 13:01:23 +01:00
4 changed files with 27 additions and 9 deletions

View File

@@ -1617,13 +1617,16 @@ function get_site_info() {
'lastpoll' => get_config('system','lastpoll'),
'info' => (($site_info) ? $site_info : ''),
'channels_total' => $channels_total_stat,
'channels_active_halfyear' => $channels_active_halfyear_stat,
'channels_active_monthly' => $channels_active_monthly_stat,
'local_posts' => $local_posts_stat,
'local_comments' => $local_comments_stat,
'hide_in_statistics' => $hide_in_statistics
];
if(! $hide_in_statistics) {
$data['channels_active_halfyear'] = $channels_active_halfyear_stat;
$data['channels_active_monthly'] = $channels_active_monthly_stat;
$data['local_posts'] = $local_posts_stat;
$data['local_comments'] = $local_comments_stat;
}
return $data;
}