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

This commit is contained in:
zottel 2014-01-10 09:21:36 +01:00
parent ee2bea37e9
commit d71989c6ba

View File

@ -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);
}