Refactoring Dispatcher::_isPrivate to directly check for controller m…

…ethods, doing in in the controller could be unnecessary
cakephp · Dec 7, 2010 · c431ddd · c431ddd
1 parent 1d67d16
commit c431ddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -308,15 +308,12 @@ public function __construct($request = null) {
 		}
 		if (empty($this->uses)) {
 			$this->modelClass = Inflector::singularize($this->name);
+		} else {
+			$this->modelClass = current($this->uses);
 		}
 		$this->modelKey = Inflector::underscore($this->modelClass);
 		$this->Components = new ComponentCollection();
 
-		$childMethods = get_class_methods($this);
-		$parentMethods = get_class_methods('Controller');
-
-		$this->methods = array_diff($childMethods, $parentMethods);
-
 		if ($request instanceof CakeRequest) {
 			$this->_setRequest($request);
 		}

diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -143,7 +143,7 @@ protected function _isPrivateAction($request) {
 				$privateAction = in_array($prefix, $prefixes);
 			}
 		}
-		return $privateAction;
+		return $privateAction && ! in_array($request->params['action'], get_class_methods('Controller'));
 	}
 
 /**
@@ -160,7 +160,7 @@ protected function _invoke(Controller $controller, CakeRequest $request) {
 		$controller->constructClasses();
 		$controller->startupProcess();
 
-		$methods = array_flip($controller->methods);
+		$methods = array_flip(get_class_methods($controller));
 
 		if (!isset($methods[$request->params['action']])) {
 			if ($controller->scaffold !== false) {