aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-09 14:56:43 -0800
committerfriendica <info@friendica.com>2014-01-09 14:56:43 -0800
commitba0fdde51cbaf12d0bf9f28c6f95421e5fadc695 (patch)
tree101b7eb6777b929184562bacfe3bdff541dcb5ec
parentfe7aa9926bd378c667e2434a49131b6c90cb9d72 (diff)
downloadvolse-hubzilla-ba0fdde51cbaf12d0bf9f28c6f95421e5fadc695.tar.gz
volse-hubzilla-ba0fdde51cbaf12d0bf9f28c6f95421e5fadc695.tar.bz2
volse-hubzilla-ba0fdde51cbaf12d0bf9f28c6f95421e5fadc695.zip
process str_replace before urlencoding
-rw-r--r--include/identity.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php
index 9fba55da5..22d72687c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1023,8 +1023,8 @@ function zid_init(&$a) {
dbesc($tmp_str)
);
// try to avoid recursion - but send them home to do a proper magic auth
- $dest = '/' . urlencode($a->query_string);
$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
+ $dest = '/' . urlencode($a->query_string);
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);
}