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 failing test case introduced in [6635]

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6636 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mariano.iglesias 2008-04-05 17:49:10 +00:00
parent 4b25239298
commit 0427272236
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/router.php
View file

@ -41,7 +41,6 @@ if (!class_exists('Object')) {
* @subpackage cake.cake.libs * @subpackage cake.cake.libs
*/ */
class Router extends Object { class Router extends Object {
/** /**
* Array of routes * Array of routes
* *
@ -773,6 +772,9 @@ class Router extends Object {
if ($match === false) { 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));
if (!empty($url[$admin])) {
$url['action'] = str_replace($admin . '_', '', $url['action']);
}
if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] == 'index')) { if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] == 'index')) {
$url['action'] = null; $url['action'] = null;