friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4457 from annando/accept-archived 

Diaspora: Accept posts from archived contacts
This commit is contained in:
Hypolite Petovan 2018-02-14 09:46:24 -05:00 committed by GitHub
parent af0e10ee20 878b2be63d
commit cdc8a3b68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/Diaspora.php
View File

@ -1059,7 +1059,7 @@ class Diaspora
//}
// We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
if ($contact["blocked"] || $contact["readonly"]) {
// Maybe blocked, don't accept.
return false;
// We are following this person?
@ -3239,7 +3239,7 @@ class Diaspora
Contact::unmarkForArchival($contact);
}
return(($return_code) ? $return_code : (-1));
return $return_code ? $return_code : -1;
}