diff options
| author | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
| commit | 344aa13c64f0fa7a246f3284bf9cdb267e6101d3 (patch) | |
| tree | 943809c01164dda7b6e4a26bc3d6c7e8c48bd6eb /Zotlabs/Module/Rmagic.php | |
| parent | 61c86212b944efa0d78dcc0364b81bfb8a0d19bc (diff) | |
| parent | 69b22e3f7916b5ba19b5ed03a55ad72bf5995291 (diff) | |
| download | volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.gz volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.bz2 volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.zip | |
Merge branch '2.8RC'
Diffstat (limited to 'Zotlabs/Module/Rmagic.php')
| -rw-r--r-- | Zotlabs/Module/Rmagic.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index 9fcc72441..bfc03f6ec 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,8 +17,8 @@ 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); - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . $dest); + $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); } } } @@ -61,9 +61,9 @@ 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=&dest=' . $dest); + goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); } } } |