Fixes bug #3581 and the issue noticed by markstory
This commit is contained in:
Hikkijp 2014-05-27 17:30:38 -03:00
parent f7e98e7427
commit c622a9dfc2

View file

@ -536,7 +536,11 @@ class CakeRoute {
$out = str_replace($search, $replace, $out); $out = str_replace($search, $replace, $out);
} }
if (strpos($this->template, '*')) { if (strpos($this->template, '**')) {
$out = str_replace('**', $params['pass'], $out);
$out = str_replace('%2F', '/', $out);
}
elseif (strpos($this->template, '*')) {
$out = str_replace('*', $params['pass'], $out); $out = str_replace('*', $params['pass'], $out);
} }
$out = str_replace('//', '/', $out); $out = str_replace('//', '/', $out);