diff options
| author | friendica <info@friendica.com> | 2014-01-10 01:14:59 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-10 01:14:59 -0800 |
| commit | 4e9866f6b20d3747b948b2eab3f6dfb23cc884e7 (patch) | |
| tree | d26bb14e9307e60b4c52a03ad3cb0bafd0f47999 /include | |
| parent | 0fef87cb43376289c39ddb0e30ee7a35fa97086d (diff) | |
| parent | d71989c6baffa05ff37817ca828c26c6962fbede (diff) | |
| download | volse-hubzilla-4e9866f6b20d3747b948b2eab3f6dfb23cc884e7.tar.gz volse-hubzilla-4e9866f6b20d3747b948b2eab3f6dfb23cc884e7.tar.bz2 volse-hubzilla-4e9866f6b20d3747b948b2eab3f6dfb23cc884e7.zip | |
Merge pull request #260 from zzottel/master
Small fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 5 |
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); } |