https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
219182d
)
Diaspora: Accept posts from archived contacts
author
Michael
<heluecht@pirati.ca>
Wed, 14 Feb 2018 14:29:28 +0000
(14:29 +0000)
committer
Michael
<heluecht@pirati.ca>
Wed, 14 Feb 2018 14:29:28 +0000
(14:29 +0000)
src/Protocol/Diaspora.php
patch
|
blob
|
history
diff --git
a/src/Protocol/Diaspora.php
b/src/Protocol/Diaspora.php
index
534f6ed
..
992da91
100644
(file)
--- a/
src/Protocol/Diaspora.php
+++ b/
src/Protocol/Diaspora.php
@@
-1057,7
+1057,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?
@@
-3237,7
+3237,7
@@
class Diaspora
Contact::unmarkForArchival($contact);
}
- return
(($return_code) ? $return_code : (-1))
;
+ return
$return_code ? $return_code : -1
;
}