friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

The value is used twice, so use a variable

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 = '')
{
$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
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
@ -2714,7 +2716,7 @@ class Contact extends BaseObject
}
if (empty($contact['id'])) {
return $url ?: $contact['url'];
return $destination;
}
$redirect = 'redir/' . $contact['id'];