aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-06 17:32:58 -0800
committerfriendica <info@friendica.com>2013-02-06 17:32:58 -0800
commite6aaf1e9bf4e4debcc539e454234dddae9915d13 (patch)
tree674aa83bb6c7bdc3749971559946f30ec2d36941
parentaf1b3c6c9ac3e3d3ed60a01f5cabeca8fe0f76dc (diff)
downloadvolse-hubzilla-e6aaf1e9bf4e4debcc539e454234dddae9915d13.tar.gz
volse-hubzilla-e6aaf1e9bf4e4debcc539e454234dddae9915d13.tar.bz2
volse-hubzilla-e6aaf1e9bf4e4debcc539e454234dddae9915d13.zip
certainly glad I didn't test that...
-rw-r--r--boot.php6
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);
}
}
}