diff options
| author | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
| commit | 47fba5827bd106f53625b543f30643ca5ba1c16e (patch) | |
| tree | bef05781eacc6dbc67d03899e0dde0257ce58096 /Zotlabs/Module/Magic.php | |
| parent | 47f75ad8bfbe8325a76ae6fe466aa8080fc87045 (diff) | |
| parent | 516167c0f8579c8a068b6e52557e7e1109f897ae (diff) | |
| download | volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.gz volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.bz2 volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
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); } } |