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

Fixing reverse-route URL generator for admin routes

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4077 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-12-07 05:58:08 +00:00
parent 94a57a89a4
commit 8d1a23e008
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cake/libs/router.php
View file

@ -394,8 +394,10 @@ class Router extends Overloadable {
if (isset($url['ext'])) {
$extension = '.' . $url['ext'];
}
if (defined('CAKE_ADMIN') && !isset($url[CAKE_ADMIN]) && isset($params['admin'])) {
$url[CAKE_ADMIN] = $params['admin'];
if (defined('CAKE_ADMIN') && !isset($url[CAKE_ADMIN]) && isset($params[CAKE_ADMIN])) {
$url[CAKE_ADMIN] = $params[CAKE_ADMIN];
} elseif (defined('CAKE_ADMIN') && $url[CAKE_ADMIN] == false) {
unset($url[CAKE_ADMIN]);
}
foreach ($_this->routes as $route) {
@ -497,6 +499,9 @@ class Router extends Overloadable {
}
}
sort($route[3]);
sort($url);
if ($route[3] == $url) {
return array(Router::__mapRoute($route, $url), array());
} elseif (!empty($params)) {
@ -507,6 +512,8 @@ class Router extends Overloadable {
if ($keysFilled != $params) {
return false;
}
} else {
return false;
}
/*if (!empty($diffs)) {
@ -557,6 +564,7 @@ class Router extends Overloadable {
$out = str_replace(':' . $key, $params[$key], $out);
unset($params[$key]);
}
// Do something else here for leftover params
return $out;
}