diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Routing] Revert to rawurlencode + whitelisting of '/'

Browse Source
This commit is contained in:
Jordi Boggiano 2011-07-07 10:17:17 +02:00
parent 2ec4b04547
commit ac1448f573
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Routing/Generator/UrlGenerator.php
View File

@ -28,11 +28,8 @@ use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
class UrlGenerator implements UrlGeneratorInterface
{
protected $context;
protected $escapedChars = array(
'%' => '%25',
'+' => '%2B',
'#' => '%23',
'?' => '%3F',
protected $decodedChars = array(
'%2F' => '/',
);
private $routes;
@ -131,7 +128,7 @@ class UrlGenerator implements UrlGeneratorInterface
}
if (!$isEmpty || !$optional) {
$url = $token[1].strtr($tparams[$token[3]], $this->escapedChars).$url;
$url = $token[1].strtr(rawurlencode($tparams[$token[3]]), $this->decodedChars).$url;
}
$optional = false;