nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix - the remote user also has magicLinks again

Browse source
This commit is contained in:
rabuzarus 2019-01-02 17:47:53 +01:00 committed by rabuzarus
parent f51918e9e9
commit 67a8f9dbd4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -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;
} }
@ -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'];
} }