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

Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework

Browse source
This commit is contained in:
Michael 2019-09-29 06:32:35 +00:00
commit 0185c91246
9 changed files with 15824 additions and 15027 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/redir.php
View file

@ -157,7 +157,7 @@ function redir_magic($a, $cid, $url)
$serverret = Network::curl($basepath . '/magic');
if ($serverret->isSuccess()) {
$separator = strpos($target_url, '?') ? '&' : '?';
$target_url .= $separator . 'zrl=' . urlencode($visitor);
$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
$a->redirect($target_url);