diff --git a/cake/basics.php b/cake/basics.php index b43538564..fa5069516 100644 --- a/cake/basics.php +++ b/cake/basics.php @@ -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); diff --git a/cake/tests/cases/dispatcher.test.php b/cake/tests/cases/dispatcher.test.php index 9b9f864c5..bf44ce88e 100644 --- a/cake/tests/cases/dispatcher.test.php +++ b/cake/tests/cases/dispatcher.test.php @@ -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() {