From 677f0708dc3d60dced04bd91e35abfe6527d07e4 Mon Sep 17 00:00:00 2001 From: Ceeram Date: Fri, 24 Feb 2012 18:16:53 +0100 Subject: [PATCH] create View instance after adding model params for request --- lib/Cake/Controller/Controller.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 8b9549117cf..8fc2eb26482 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -903,15 +903,6 @@ public function render($view = null, $layout = null) { return $this->response; } - $viewClass = $this->viewClass; - if ($this->viewClass != 'View') { - list($plugin, $viewClass) = pluginSplit($viewClass, true); - $viewClass = $viewClass . 'View'; - App::uses($viewClass, $plugin . 'View'); - } - - $View = new $viewClass($this); - if (!empty($this->uses)) { foreach ($this->uses as $model) { list($plugin, $className) = pluginSplit($model); @@ -922,6 +913,15 @@ public function render($view = null, $layout = null) { $this->request->params['models'][$this->modelClass] = array('plugin' => $this->plugin, 'className' => $this->modelClass); } + $viewClass = $this->viewClass; + if ($this->viewClass != 'View') { + list($plugin, $viewClass) = pluginSplit($viewClass, true); + $viewClass = $viewClass . 'View'; + App::uses($viewClass, $plugin . 'View'); + } + + $View = new $viewClass($this); + $models = ClassRegistry::keys(); foreach ($models as $currentModel) { $currentObject = ClassRegistry::getObject($currentModel);