diff options
| author | Mario <mario@mariovavti.com> | 2019-04-25 11:54:37 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-04-25 11:54:37 +0200 |
| commit | d689778465c0439d0ceae071dab2509e3f95403e (patch) | |
| tree | ee68e6a3ec60aeedd21fff263e826735fd51f429 /Zotlabs/Module/Magic.php | |
| parent | c123fa5422c9c2df741819c4fb9a1b19547866d4 (diff) | |
| parent | 3c8f8b76aa35eed1e612cb20537b8648bef3daca (diff) | |
| download | volse-hubzilla-d689778465c0439d0ceae071dab2509e3f95403e.tar.gz volse-hubzilla-d689778465c0439d0ceae071dab2509e3f95403e.tar.bz2 volse-hubzilla-d689778465c0439d0ceae071dab2509e3f95403e.zip | |
Merge branch 'dev' into 'dev'
hubloc confusion in magic auth
See merge request hubzilla/core!1608
Diffstat (limited to 'Zotlabs/Module/Magic.php')
| -rw-r--r-- | Zotlabs/Module/Magic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 71737eef8..e8e960574 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -169,8 +169,8 @@ class Magic extends \Zotlabs\Web\Controller { $token = $j['token']; } - $x = strpbrk($dest,'?&'); - $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); + $strp = strpbrk($dest,'?&'); + $args = (($strp) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); goaway($dest . $args); } } |