aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-02-26 16:45:04 -0800
committerzotlabs <mike@macgirvin.com>2018-02-26 16:45:04 -0800
commitafe2ba36904de4d308fb0620ebef52d7eefecda0 (patch)
tree178f0e376f243c7fa048b4e389001234c07bd72e /include
parent01776e767d1976663d2c36fd7e6e4431c16c84c1 (diff)
parentfe7fba4789fac2024c4e8e711e2f8a2492c683bd (diff)
downloadvolse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.tar.gz
volse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.tar.bz2
volse-hubzilla-afe2ba36904de4d308fb0620ebef52d7eefecda0.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
-rw-r--r--include/text.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index 98d6947a4..d4cfecd75 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'],