diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/rmagic.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/rmagic.php')
| -rw-r--r-- | mod/rmagic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/rmagic.php b/mod/rmagic.php index 597c6ed9c..6a47b495a 100644 --- a/mod/rmagic.php +++ b/mod/rmagic.php @@ -14,7 +14,7 @@ function rmagic_init(&$a) { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace('zid=','zid_=',get_app()->query_string); + $dest = z_root() . '/' . str_replace('zid=','zid_=',App::$query_string); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . $dest); } } @@ -70,7 +70,7 @@ function rmagic_post(&$a) { if($_SESSION['return_url']) $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$a->query_string)); + $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',App::$query_string)); goaway($url . '/magic' . '?f=&dest=' . $dest); } |