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

Merge pull request #7125 from annando/magic

Browse source 
Magic links should work again
This commit is contained in:
Philipp 2019-05-10 10:37:56 +02:00 committed by GitHub
parent 860338a675 f04bb820ad
commit f840da5dc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Model/Contact.php
View file

@ -2374,10 +2374,6 @@ class Contact extends BaseObject
*/ */
public static function magicLinkByContact($contact, $url = '') public static function magicLinkByContact($contact, $url = '')
{ {
if (empty($contact['id']) || empty($contact['uid'])) {
return $url ?: $contact['url'];
}
if ((!local_user() && !remote_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'];
} }
@ -2387,10 +2383,14 @@ class Contact extends BaseObject
return $url; return $url;
} }
if ($contact['uid'] != 0) { if (!empty($contact['uid'])) {
return self::magicLink($contact['url'], $url); return self::magicLink($contact['url'], $url);
} }
if (empty($contact['id'])) {
return $url ?: $contact['url'];
}
$redirect = 'redir/' . $contact['id']; $redirect = 'redir/' . $contact['id'];
if ($url != '') { if ($url != '') {