Revert "Refactoring Dispatcher::_isPrivate to directly check for cont…

…roller methods, doing in in the controller could be unnecessary" This reverts commit c431ddd. Conflicts: lib/Cake/Routing/Dispatcher.php
cakephp · Feb 22, 2011 · a9d2078 · a9d2078
1 parent b1e007f
commit a9d2078
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -319,12 +319,15 @@ 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
@@ -142,7 +142,7 @@ protected function _isPrivateAction($request) {
 			}
 		}
 
-		return $privateAction || in_array($request->params['action'], get_class_methods('Controller'));
+		return $privateAction;
 	}
 
 /**
@@ -159,7 +159,7 @@ protected function _invoke(Controller $controller, CakeRequest $request) {
 		$controller->constructClasses();
 		$controller->startupProcess();
 
-		$methods = array_flip(get_class_methods($controller));
+		$methods = array_flip($controller->methods);
 
 		if (!isset($methods[$request->params['action']])) {
 			if ($controller->scaffold !== false) {