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

reverted comments, but maintained multi-line comment. 

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-05-17 18:09:34 +02:00
parent 4c2d4934f7
commit 0394004fee
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/diaspora.php
View File

@ -881,8 +881,8 @@ class Diaspora {
return $r[0];
} else {
/*
* Not found yet? Then use another function for it that will
* possibly create a contact entry.
* We haven't found it?
* We use another function for it that will possibly create a contact entry.
*/
$cid = get_contact($handle, $uid);
@ -923,7 +923,7 @@ class Diaspora {
private static function post_allow($importer, $contact, $is_comment = false) {
/*
* perhaps we were already sharing with this person. Now they're sharing with us.
* Perhaps we were already sharing with this person. Now they're sharing with us.
* That makes us friends.
* Normally this should have handled by getting a request - but this could get lost
*/
@ -937,11 +937,11 @@ class Diaspora {
logger("defining user ".$contact["nick"]." as friend");
}
// Is this contact wanted?
// We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
// Maybe blocked, don't accept.
return false;
// Is this person being followed?
// We are following this person?
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
// Yes, then it is fine.
return true;