harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo from previous checkin and partial fix to hubzilla #965 - show any connection without comment permission as archived in contact_block().

Browse Source
This commit is contained in:
zotlabs 2018-01-26 13:42:53 -08:00
parent d70c42b495
commit 4eead1c688
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/account.php
View File

@ -266,7 +266,7 @@ function verify_email_address($arr) {
$email = $arr['email']; $email = $arr['email'];
$a = q("select * from account where account_email = '%s' limit 1", $a = q("select * from account where account_email = '%s' limit 1",
dbesc($arr['email']) dbesc($arr['email'])
} );
if(! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) { if(! ($a && ($a[0]['account_flags'] & ACCOUNT_UNVERIFIED))) {
return false; return false;
} }

9
include/text.php
View File

@ -973,7 +973,14 @@ function contact_block() {
$contacts = t('Connections'); $contacts = t('Connections');
$micropro = Array(); $micropro = Array();
foreach($r as $rr) { 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'); $micropro[] = micropro($rr,true,'mpfriend');
} }
} }