Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework
This commit is contained in:
commit
0185c91246
9 changed files with 15824 additions and 15027 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue