diff options
| -rw-r--r-- | it_html.class | 1 | ||||
| -rwxr-xr-x | tests/it_html.t | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/it_html.class b/it_html.class index 9db8893..3537707 100644 --- a/it_html.class +++ b/it_html.class @@ -540,6 +540,7 @@ static function U(/* ... */) if (!($u = @parse_url($base))) list($u['path'], $u['query']) = explode("?", $base, 2); + $u['query'] = strtr($u['query'], array("?" => rawurlencode("?"))); $u['host'] = preg_match('/[^-_.0-9a-z]/i', $u['host']) && function_exists('idn_to_ascii') && ($idnahost = idn_to_ascii($GLOBALS['it_html']->p['charset'] == "iso-8859-1" ? utf8_encode($u['host']) : $u['host'])) ? $idnahost : $u['host']; # Punycode hostname to include into webpage $u['host'] = preg_replace_callback('/[^-_.0-9a-z\x80-\xff]/i', function($m) { return rawurlencode($m[0]); }, $u['host']); # Encode garbage chars in host diff --git a/tests/it_html.t b/tests/it_html.t index 22c8459..2dc7be5 100755 --- a/tests/it_html.t +++ b/tests/it_html.t @@ -197,7 +197,7 @@ is( is( U('/test.html?foo=bar?qux=gna', array('?q' => '?r')), - '/test.html?foo=bar?qux=gna&%3Fq=%3Fr', + '/test.html?foo=bar%3Fqux=gna&%3Fq=%3Fr', 'U() quoting of ? in args but not base' ); is( |