diff options
author | Mario <mario@mariovavti.com> | 2018-07-19 09:20:45 +0200 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2018-07-19 09:20:45 +0200 |
commit | 685d05f98be3cbe991a9427a9fe522c383ad56cd (patch) | |
tree | 9de86698483283b8d4d36bebc6162949172d9f07 /Zotlabs/Module/Magic.php | |
parent | 4a6f775334fbf3af2e8e6c781a9a44192a6526d0 (diff) | |
parent | 931afe98b13399342d5abb4cb13cb09efc09ecad (diff) | |
download | volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.tar.gz volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.tar.bz2 volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.zip |
Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'
mangled urls on redirects
See merge request hubzilla/core!1228
Diffstat (limited to 'Zotlabs/Module/Magic.php')
-rw-r--r-- | Zotlabs/Module/Magic.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 25c318f30..e034f1cdf 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -14,15 +14,16 @@ class Magic extends \Zotlabs\Web\Controller { logger('mod_magic: args: ' . print_r($_REQUEST,true),LOGGER_DATA); $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); + $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); $test = ((x($_REQUEST,'test')) ? intval($_REQUEST['test']) : 0); $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - // Apache(?) appears to perform an htmlentities() operation on this variable - - $dest = html_entity_decode($dest); + + if($bdest) + $dest = hex2bin($bdest); $parsed = parse_url($dest); if(! $parsed) { |