diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-05 11:25:39 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-05 11:25:39 +0200 |
| commit | 5be9477f21626469dedcff4f96243be2bfafdb71 (patch) | |
| tree | fcf56e3e85e6d28d8901ef3a0a638bfb40212b51 /Zotlabs/Module/Rmagic.php | |
| parent | 6f88d5e92be06ad8fa61f900e8a4fb41ba54135e (diff) | |
| parent | 15b9a67c01964b83ac724945fe416dd35f66e914 (diff) | |
| download | volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.gz volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.tar.bz2 volse-hubzilla-5be9477f21626469dedcff4f96243be2bfafdb71.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Rmagic.php')
| -rw-r--r-- | Zotlabs/Module/Rmagic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index 0c4eb9ae4..bfc03f6ec 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,7 +17,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string); + $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); } } @@ -61,7 +61,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($_SESSION['return_url']) $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string)); + $dest = urlencode(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); } |