From d71989c6baffa05ff37817ca828c26c6962fbede Mon Sep 17 00:00:00 2001 From: zottel Date: Fri, 10 Jan 2014 09:21:36 +0100 Subject: fix the fix (can't work on query if it hasn't been added to $dest yet) --- include/identity.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index 22d72687c..30b6e4b6b 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1023,8 +1023,9 @@ function zid_init(&$a) { dbesc($tmp_str) ); // try to avoid recursion - but send them home to do a proper magic auth - $dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest); - $dest = '/' . urlencode($a->query_string); + $query = $a->query_string; + $query = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$query); + $dest = '/' . urlencode($query); if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest); } -- cgit v1.2.3