fix the fix (can't work on query if it hasn't been added to $dest yet)

1 files 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);
 			}