Refactoring how models are passed as a request parameter to the view,…

… now the full plugin and model name will be passed on
cakephp · Jul 14, 2011 · 567ac02 · 567ac02
1 parent e45b35c
commit 567ac02
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -808,19 +808,19 @@ public function render($view = null, $layout = null) {
 
 		if (!empty($this->uses)) {
 			foreach ($this->uses as $model) {
-				list($plugin, $model) = pluginSplit($model);
-				$this->request->params['models'][$model] = $plugin; 
+				list($plugin, $className) = pluginSplit($model);
+				$this->request->params['models'][$model] = compact('plugin', 'className'); 
 			}
 		}
 
 		$models = ClassRegistry::keys();
 		foreach ($models as $currentModel) {
 			$currentObject = ClassRegistry::getObject($currentModel);
 			if (is_a($currentObject, 'Model')) {
-				list($plugin, $package) = pluginSplit(App::location(get_class($currentObject)));
-				$this->request->params['models'][$currentObject->alias] = $plugin;
-				$View->validationErrors[$currentObject->alias] =&
-					$currentObject->validationErrors;
+				$className = get_class($currentObject);
+				list($plugin, $package) = pluginSplit(App::location($className));
+				$this->request->params['models'][$currentObject->alias] = compact('plugin', 'className');
+				$View->validationErrors[$currentObject->alias] =& $currentObject->validationErrors;
 			}
 		}