adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing params that are not part of $url.

Browse source
This commit is contained in:
mark_story 2009-10-08 00:35:06 -04:00
parent 4a81017f9d
commit 8ebd3ed410
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/router.php
View file

@ -818,12 +818,14 @@ class Router {
}
}
$plugin = false;
if (array_key_exists('plugin', $url)) {
$plugin = $url['plugin'];
}
$url = array_merge(array('controller' => $params['controller'], 'plugin' => $params['plugin']), Set::filter($url, true));
$url = array_merge(
array('controller' => $params['controller'], 'plugin' => $params['plugin']),
Set::filter($url, true)
);
if ($plugin !== false) {
$url['plugin'] = $plugin;
@ -834,7 +836,7 @@ class Router {
unset($url['ext']);
}
$match = false;
for ($i = 0, $len = count($_this->routes); $i < $len; $i++) {
$route =& $_this->routes[$i];
$route->compile();
@ -854,7 +856,7 @@ class Router {
$named = $args = array();
$skip = array_merge(
array('bare', 'action', 'controller', 'plugin', 'ext', '?', '#', 'prefix'),
array('bare', 'action', 'controller', 'plugin', 'prefix'),
$_this->__prefixes
);