aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2014-01-10 09:21:36 +0100
committerzottel <github@zottel.net>2014-01-10 09:21:36 +0100
commitd71989c6baffa05ff37817ca828c26c6962fbede (patch)
treeaa90e62cf786e30bd9d3a70f2c290f1d2a5a998e
parentee2bea37e9a46e8dcd6b7df655fc56c1feb8132e (diff)
downloadvolse-hubzilla-d71989c6baffa05ff37817ca828c26c6962fbede.tar.gz
volse-hubzilla-d71989c6baffa05ff37817ca828c26c6962fbede.tar.bz2
volse-hubzilla-d71989c6baffa05ff37817ca828c26c6962fbede.zip
fix the fix (can't work on query if it hasn't been added to $dest yet)
-rw-r--r--include/identity.php5
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);
}