diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-05 19:24:03 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-05 19:24:03 -0700 |
| commit | d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8 (patch) | |
| tree | 305fbcd0a1e55de48d5e8a406c002f61f3512079 /Zotlabs/Module/Rmagic.php | |
| parent | 2862baeee1cbecead3c9d38d2798140ac0256d1a (diff) | |
| parent | 0ddc3e4af2fe70159b36f86cb367d1a24ec6ac71 (diff) | |
| download | volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.gz volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.bz2 volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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); } |