keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Weird stuff

Browse source
This commit is contained in:
Michael 2018-06-02 13:00:47 +00:00
parent 81c002370e
commit c6c94b8cea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Contact.php
View file

@ -1699,7 +1699,7 @@ class Contact extends BaseObject
{ {
$cid = self::getIdForURL($contact_url, 0, true); $cid = self::getIdForURL($contact_url, 0, true);
if (empty($cid)) { if (empty($cid)) {
return ($url != '') ? $url : $contact_url; return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
} }
return self::magicLinkbyId($cid, $url); return self::magicLinkbyId($cid, $url);
@ -1718,7 +1718,7 @@ class Contact extends BaseObject
$contact = dba::selectFirst('contact', ['network', 'url', 'uid'], ['id' => $cid]); $contact = dba::selectFirst('contact', ['network', 'url', 'uid'], ['id' => $cid]);
if ($contact['network'] != NETWORK_DFRN) { if ($contact['network'] != NETWORK_DFRN) {
return ($url != '') ? $url : $contact['url']; return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
} }
// Only redirections to the same host do make sense // Only redirections to the same host do make sense