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

Merge pull request #6364 from rabuzarus/20190102_-_fix_magic_links_for_remote_users 

Bugfix - the remote user also has magicLinks again
pull/6371/head
Michael Vogel 2019-01-03 18:04:36 +01:00 zatwierdzone przez GitHub
rodzic d1fb0be556 67a8f9dbd4
commit b8030313e5
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/Model/Contact.php
Wyświetl plik

@ -2072,7 +2072,7 @@ class Contact extends BaseObject
*/ */
public static function magicLink($contact_url, $url = '') public static function magicLink($contact_url, $url = '')
{ {
if (!local_user()) { if (!local_user() && remote_user()) {
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
} }
@ -2097,7 +2097,7 @@ class Contact extends BaseObject
$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]); $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
return self::magicLinkbyContact($contact, $url); return self::magicLinkbyContact($contact, $url);
} }
/** /**
* @brief Returns a magic link to authenticate remote visitors * @brief Returns a magic link to authenticate remote visitors
@ -2109,7 +2109,7 @@ class Contact extends BaseObject
*/ */
public static function magicLinkbyContact($contact, $url = '') public static function magicLinkbyContact($contact, $url = '')
{ {
if (!local_user() || ($contact['network'] != Protocol::DFRN)) { if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
} }