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

Removing code.

Browse source
This commit is contained in:
mark_story 2009-12-01 21:43:36 -05:00
parent 02ed766874
commit 4c175cc0bc
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/router.php
View file

@ -751,11 +751,6 @@ class Router {
}
}
if (array_key_exists('plugin', $url)) {
$params['plugin'] = $url['plugin'];
}
$backupUrl = $url;
$url += array('controller' => $params['controller'], 'plugin' => $params['plugin']);
if (isset($url['ext'])) {
@ -769,7 +764,7 @@ class Router {
$originalUrl = $url;
if (isset($route->params['persist'], $params)) {
$url = $route->persistParams($url, array_merge($params, $backupUrl));
$url = $route->persistParams($url, $params);
}
if ($match = $route->match($url)) {
@ -799,7 +794,7 @@ class Router {
}
if ($match === false) {
list($args, $named) = array(Set::filter($args, true), Set::filter($named));
list($args, $named) = array(Set::filter($args, true), Set::filter($named, true));
foreach ($self->__prefixes as $prefix) {
if (!empty($url[$prefix])) {
$url['action'] = str_replace($prefix . '_', '', $url['action']);