bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

The value is used twice, so use a variable

Browse source
This commit is contained in:
Michael 2019-09-10 04:04:07 +00:00
parent 8fc8e26e23
commit 0a0a961c52
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Contact.php
View file

@ -2700,8 +2700,10 @@ class Contact extends BaseObject
*/ */
public static function magicLinkByContact($contact, $url = '') public static function magicLinkByContact($contact, $url = '')
{ {
$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $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 $destination;
} }
// Only redirections to the same host do make sense // Only redirections to the same host do make sense
@ -2714,7 +2716,7 @@ class Contact extends BaseObject
} }
if (empty($contact['id'])) { if (empty($contact['id'])) {
return $url ?: $contact['url']; return $destination;
} }
$redirect = 'redir/' . $contact['id']; $redirect = 'redir/' . $contact['id'];