mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Fixing failing test case introduced in [6635]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6636 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
4b25239298
commit
0427272236
1 changed files with 3 additions and 1 deletions
|
@ -41,7 +41,6 @@ if (!class_exists('Object')) {
|
|||
* @subpackage cake.cake.libs
|
||||
*/
|
||||
class Router extends Object {
|
||||
|
||||
/**
|
||||
* Array of routes
|
||||
*
|
||||
|
@ -773,6 +772,9 @@ class Router extends Object {
|
|||
|
||||
if ($match === false) {
|
||||
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')) {
|
||||
$url['action'] = null;
|
||||
|
|
Loading…
Reference in a new issue