Skip to content

Commit

Permalink
removed parameter from url_encode filter
Browse files Browse the repository at this point in the history
the filter now only uses the more appropriate rawurlencode() which is also more consistent with the escape('url') filter
  • Loading branch information
Tobion authored and fabpot committed May 26, 2014
1 parent 4a7ef0c commit 49ba6b4
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions lib/Twig/Extension/Core.php
Expand Up @@ -590,21 +590,16 @@ function twig_number_format_filter(Twig_Environment $env, $number, $decimal = nu
* URL encodes a string as a path segment or an array as a query string.
*
* @param string|array $url A URL or an array of query parameters
* @param bool $raw true to use rawurlencode() instead of urlencode
*
* @return string The URL encoded value
*/
function twig_urlencode_filter($url, $raw = false)
function twig_urlencode_filter($url)
{
if (is_array($url)) {
return http_build_query($url, '', '&');
}

if ($raw) {
return rawurlencode($url);
}

return urlencode($url);
return rawurlencode($url);
}

if (version_compare(PHP_VERSION, '5.3.0', '<')) {
Expand Down

0 comments on commit 49ba6b4

Please sign in to comment.