mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-18 18:46:17 +00:00
Removed check for parent class in loadController()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5674 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
d8f2a62057
commit
3e9a2a0851
2 changed files with 4 additions and 4 deletions
|
@ -387,7 +387,7 @@
|
|||
|
||||
$className = $name . 'Controller';
|
||||
|
||||
if (class_exists(low($className)) && is_subclass_of($className, $parent)) {
|
||||
if (class_exists($className)) {
|
||||
return true;
|
||||
} else {
|
||||
$name = Inflector::underscore($className);
|
||||
|
|
|
@ -592,7 +592,7 @@ class DispatcherTest extends UnitTestCase {
|
|||
|
||||
Router::reload();
|
||||
Router::connect('/admin/:controller/:action/*', array('prefix'=>'admin'), array('controller', 'action'));
|
||||
|
||||
|
||||
$dispatcher =& new TestDispatcher();
|
||||
$dispatcher->base = false;
|
||||
|
||||
|
@ -600,9 +600,9 @@ class DispatcherTest extends UnitTestCase {
|
|||
restore_error_handler();
|
||||
@$controller = $dispatcher->dispatch($url, array('return' => 1));
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
|
||||
|
||||
$expected = 'privateAction';
|
||||
$this->assertIdentical($expected, $controller);
|
||||
$this->assertIdentical($expected, $controller);
|
||||
}
|
||||
|
||||
function tearDown() {
|
||||
|
|
Loading…
Add table
Reference in a new issue