From db9c3e5bf39113710910787997549b6c6e81f852 Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Tue, 20 Mar 2012 14:44:14 -0700 Subject: [PATCH] Remove unused code and correct doc for modelClass --- lib/Cake/Controller/Controller.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 9cd1a34a4..bef8bfcc9 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -265,7 +265,7 @@ class Controller extends Object implements CakeEventListener { public $methods = array(); /** - * This controller's primary model class name, the Inflector::classify()'ed version of + * This controller's primary model class name, the Inflector::singularize()'ed version of * the controller's $name property. * * Example: For a controller named 'Comments', the modelClass would be 'Comment' @@ -363,9 +363,6 @@ class Controller extends Object implements CakeEventListener { foreach ($this->uses as $modelClass) { list($plugin, $class) = pluginSplit($modelClass, true); if ($name === $class) { - if (!$plugin) { - $plugin = $this->plugin ? $this->plugin . '.' : null; - } return $this->loadModel($modelClass); } }