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

fixing router args in urls, ticket #1811

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4212 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2006-12-26 18:06:42 +00:00
parent a4ca03ed69
commit fc66c8aa6a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/router.php
View file

@ -263,7 +263,6 @@ class Router extends Overloadable {
foreach($names as $name) {
$out[$name] = null;
}
$ii = 0;
if (is_array($defaults)) {
foreach($defaults as $name => $value) {
@ -275,15 +274,16 @@ class Router extends Overloadable {
}
}
foreach($r as $found) {
foreach($r as $key => $found) {
// if $found is a named url element (i.e. ':action')
if (isset($names[$ii])) {
$out[$names[$ii]] = $found;
if (isset($names[$key]) && !empty($found)) {
$out[$names[$key]] = $found;
} else if (isset($names[$key]) && empty($names[$key]) && empty($out[$names[$key]])){
break; //leave the default values;
} else {
// unnamed elements go in as 'pass'
$out['pass'] = array_filter(explode('/', $found));
}
$ii++;
}
break;
}
@ -425,7 +425,7 @@ class Router extends Overloadable {
$args[] = $url[$keys[$i]];
} else if(!empty($path['namedArgs']) && in_array($keys[$i], array_keys($path['namedArgs']))){
$named[] = array($keys[$i], $url[$keys[$i]]);
} else {
} else if ($match === false) {
$args[] = $keys[$i] . $path['argSeparator'] .$url[$keys[$i]];
}
}
@ -441,7 +441,6 @@ class Router extends Overloadable {
for ($i = 0; $i < $count; $i++) {
$named[$i] = join($path['argSeparator'], $named[$i]);
}
$combined = join('/', $named);
}
@ -497,12 +496,12 @@ class Router extends Overloadable {
if (!is_numeric($key) && !isset($url[$key])) {
$url[$key] = $val;
}
}*/
}*/
ksort($defaults);
ksort($url);
if ($defaults == $url) {
return array(Router::__mapRoute($route, $url), array());
} elseif(!empty($params)) {
} elseif(!empty($params) && !empty($route[3])) {
if(array_key_exists(0, $url)) {
return false;
}
@ -568,6 +567,7 @@ class Router extends Overloadable {
} else {
$out = $route[0] . $params['pass'];
}
foreach ($route[2] as $key) {
$out = str_replace(':' . $key, $params[$key], $out);
unset($params[$key]);