adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove rawurldecode from the _parseArgs function in CakeRoute since urldecode is already called on the URL string in CakeRoute::parse() when creating the $route array that is passed to _parseArgs.

Browse source 
The result of the double urldecodes is parameters with meaningful '%' signs being stripped away on accident, and the web server reporting that the requested address doesn't exist.
This commit is contained in:
Melvin.Ross@gmail.com 2014-01-24 16:14:58 -06:00
parent ddf046a246
commit 8d6814e63f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Routing/Route/CakeRoute.php
View file

@ -297,12 +297,12 @@ class CakeRoute {
$separatorIsPresent = strpos($param, $namedConfig['separator']) !== false;
if ((!isset($this->options['named']) || !empty($this->options['named'])) && $separatorIsPresent) {
list($key, $val) = explode($namedConfig['separator'], $param, 2);
$key = rawurldecode($key);
$val = rawurldecode($val);
$key = key;
$val = $val;
$hasRule = isset($rules[$key]);
$passIt = (!$hasRule && !$greedy) || ($hasRule && !$this->_matchNamed($val, $rules[$key], $context));
if ($passIt) {
$pass[] = rawurldecode($param);
$pass[] = $param;
} else {
if (preg_match_all('/\[([A-Za-z0-9_-]+)?\]/', $key, $matches, PREG_SET_ORDER)) {
$matches = array_reverse($matches);
@ -323,7 +323,7 @@ class CakeRoute {
$named = array_merge_recursive($named, array($key => $val));
}
} else {
$pass[] = rawurldecode($param);
$pass[] = $param;
}
}
return array($pass, $named);