mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

reverted comments, but maintained multi-line comment. 

Signed-off-by: Roland Häder <roland@mxchange.org>
pull/3473/head
Roland Häder 2017-05-17 18:09:34 +02:00
rodzic 4c2d4934f7
commit 0394004fee
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B72F8185C6C7BD78
1 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
include/diaspora.php
Wyświetl plik

@ -881,8 +881,8 @@ class Diaspora {
return $r[0]; return $r[0];
} else { } else {
/* /*
* Not found yet? Then use another function for it that will * We haven't found it?
* possibly create a contact entry. * We use another function for it that will possibly create a contact entry.
*/ */
$cid = get_contact($handle, $uid); $cid = get_contact($handle, $uid);
@ -923,7 +923,7 @@ class Diaspora {
private static function post_allow($importer, $contact, $is_comment = false) { 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. * That makes us friends.
* Normally this should have handled by getting a request - but this could get lost * 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"); 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"]) { if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
// Maybe blocked, don't accept. // Maybe blocked, don't accept.
return false; return false;
// Is this person being followed? // We are following this person?
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) { } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
// Yes, then it is fine. // Yes, then it is fine.
return true; return true;