certainly glad I didn't test that...

1 files changed, 4 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 9e7485285..647e8a6e3 100644
--- a/boot.php
+++ b/boot.php
@@ -1980,8 +1980,10 @@ function zid_init(&$a) {
 				dbesc($tmp_str)
 			);
 			// try to avoid recursion - but send them home to do a proper magic auth
-			if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr(get_app()->query_string,'/magic'))) {
-				goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . z_root() . get_app()->query_string);
+			$dest = $a->query_string;
+			$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
+			if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic'))) {
+				goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . z_root() . $dest);
 			}
 		}
 	}