mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
_Trailing_ and $this->keys also do not need to be urldecoded. Both _trailing_ and $this->keys gets set in _writeRoute, which also makes the regex that used to create the array $route.
Any keys in $route that match [_trailing_] or any values in $this->keys are put there through the exection of preg_match. The URL is decoded before being passed to preg_match, which means the values inside of [_trailing_]etc. have already been decoded.
This commit is contained in:
parent
83f37e48a9
commit
7f496fad94
1 changed files with 2 additions and 2 deletions
|
@ -235,7 +235,7 @@ class CakeRoute {
|
||||||
|
|
||||||
foreach ($this->keys as $key) {
|
foreach ($this->keys as $key) {
|
||||||
if (isset($route[$key])) {
|
if (isset($route[$key])) {
|
||||||
$route[$key] = rawurldecode($route[$key]);
|
$route[$key] = $route[$key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ class CakeRoute {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($route['_trailing_'])) {
|
if (isset($route['_trailing_'])) {
|
||||||
$route['pass'][] = rawurldecode($route['_trailing_']);
|
$route['pass'][] = $route['_trailing_'];
|
||||||
unset($route['_trailing_']);
|
unset($route['_trailing_']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue