aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-02-25 08:36:52 -0500
committerAndrew Manning <tamanning@zoho.com>2018-02-25 08:36:52 -0500
commite3095ce6b2c76f13a852f0ec5f782d71101a7c6a (patch)
treebeab28cbc399ea17e0c2fd6c38724387bafa7c5c /include
parent70b8f3240f9bc38a41e314f613f6c1bd69f5b430 (diff)
parent673cf8d35e224fcbbc0caef5e638c08bc3914feb (diff)
downloadvolse-hubzilla-e3095ce6b2c76f13a852f0ec5f782d71101a7c6a.tar.gz
volse-hubzilla-e3095ce6b2c76f13a852f0ec5f782d71101a7c6a.tar.bz2
volse-hubzilla-e3095ce6b2c76f13a852f0ec5f782d71101a7c6a.zip
Merge branch 'dev' into oauth2
Diffstat (limited to 'include')
-rw-r--r--include/network.php11
-rw-r--r--include/text.php3
2 files changed, 9 insertions, 5 deletions
diff --git a/include/network.php b/include/network.php
index 0824183f7..f8cb68613 100644
--- a/include/network.php
+++ b/include/network.php
@@ -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;
}
diff --git a/include/text.php b/include/text.php
index 35a367d43..6014f7437 100644
--- a/include/text.php
+++ b/include/text.php
@@ -979,7 +979,7 @@ function contact_block() {
// than wishful thinking; even though soapbox channels and feeds will disable it.
if(! intval(get_abconfig(App::$profile['uid'],$rr['xchan_hash'],'their_perms','post_comments'))) {
- $rr['archived'] = true;
+ $rr['oneway'] = true;
}
$micropro[] = micropro($rr,true,'mpfriend');
}
@@ -1033,6 +1033,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array(
'$click' => (($contact['click']) ? $contact['click'] : ''),
'$class' => $class . (($contact['archived']) ? ' archived' : ''),
+ '$oneway' => (($contact['oneway']) ? true : false),
'$url' => $url,
'$photo' => $contact['xchan_photo_s'],
'$name' => $contact['xchan_name'],