aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-01-26 13:42:53 -0800
committerzotlabs <mike@macgirvin.com>2018-01-26 13:42:53 -0800
commit4eead1c688f57bdf04091675fa38c5eed9f6acde (patch)
tree2d313fa5bb9d86f15ec3165ba72cdf45f1e7da23
parentd70c42b4954fceed64fdc3c7b4f0f5095752b53f (diff)
downloadvolse-hubzilla-4eead1c688f57bdf04091675fa38c5eed9f6acde.tar.gz
volse-hubzilla-4eead1c688f57bdf04091675fa38c5eed9f6acde.tar.bz2
volse-hubzilla-4eead1c688f57bdf04091675fa38c5eed9f6acde.zip
typo from previous checkin and partial fix to hubzilla #965 - show any connection without comment permission as archived in contact_block().
-rw-r--r--include/account.php2
-rw-r--r--include/text.php9
2 files changed, 9 insertions, 2 deletions
diff --git a/include/account.php b/include/account.php
index 3a7b677be..3ac485974 100644
--- a/include/account.php
+++ b/include/account.php
@@ -266,7 +266,7 @@ function verify_email_address($arr) {
$email = $arr['email'];
$a = q("select * from account where account_email = '%s' limit 1",
dbesc($arr['email'])
- }
+ );
if(! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) {
return false;
}
diff --git a/include/text.php b/include/text.php
index 956f42f7d..8ec6ebace 100644
--- a/include/text.php
+++ b/include/text.php
@@ -973,7 +973,14 @@ function contact_block() {
$contacts = t('Connections');
$micropro = Array();
foreach($r as $rr) {
- $rr['archived'] = (intval($rr['abook_archived']) ? true : false);
+
+ // There is no setting to discover if you are bi-directionally connected
+ // Use the ability to post comments as an indication that this relationship is more
+ // 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;
+ }
$micropro[] = micropro($rr,true,'mpfriend');
}
}