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

Don't use the "url" parameter on redir if it points to the same contact

This commit is contained in:
Michael 2019-09-24 21:44:37 +00:00
parent 8a5eb689f7
commit 87462ec67f
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

@ -1193,7 +1193,7 @@ class Contact extends BaseObject
$sparkle = false; $sparkle = false;
if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$sparkle = true; $sparkle = true;
$profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url']; $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
} else { } else {
$profile_link = $contact['url']; $profile_link = $contact['url'];
} }
@ -2744,7 +2744,7 @@ class Contact extends BaseObject
$redirect = 'redir/' . $contact['id']; $redirect = 'redir/' . $contact['id'];
if ($url != '') { if (($url != '') && !Strings::compareLink($contact['url'], $url)) {
$redirect .= '?url=' . $url; $redirect .= '?url=' . $url;
} }