From 293ef95f33c2ab9cf645f0ca88429f7da8a78867 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 14 Nov 2010 18:43:46 -0500 Subject: [PATCH] Adding more documentation, and adding some return early changes. --- cake/libs/dispatcher.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php index fe05ce05858..5bfa749cbea 100644 --- a/cake/libs/dispatcher.php +++ b/cake/libs/dispatcher.php @@ -157,7 +157,6 @@ protected function _invoke(Controller $controller, CakeRequest $request) { $methods = array_flip($controller->methods); - if (!isset($methods[$request->params['action']])) { if ($controller->scaffold !== false) { App::import('Controller', 'Scaffold', false); @@ -185,10 +184,13 @@ protected function _invoke(Controller $controller, CakeRequest $request) { } /** - * Returns array of GET and POST parameters. GET parameters are taken from given URL. + * Applies Routing and additionalParameters to the request to be dispatched. + * If Routes have not been loaded they will be loaded, and app/config/routes.php will be run. * - * @param CakeRequest $fromUrl CakeRequest object to mine for parameter information. - * @return array Parameters found in POST and GET. + * @param CakeRequest $request CakeRequest object to mine for parameter information. + * @param array $additionalParams An array of additional parameters to set to the request. + * Useful when Object::requestAction() is involved + * @return CakeRequest The request object with routing params set. */ public function parseParams(CakeRequest $request, $additionalParams = array()) { if (count(Router::$routes) > 0) { @@ -213,16 +215,14 @@ public function parseParams(CakeRequest $request, $additionalParams = array()) { * @return mixed name of controller if not loaded, or object if loaded */ protected function _getController($request) { - $controller = false; $ctrlClass = $this->_loadController($request); if (!$ctrlClass) { - return $controller; + return false; } $ctrlClass .= 'Controller'; if (class_exists($ctrlClass)) { - $controller = new $ctrlClass($request); + return new $ctrlClass($request); } - return $controller; } /**