adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #575 from shama/patch-controller

Browse source 
Remove unused code and correct doc for modelClass
This commit is contained in:
Mark Story 2012-03-20 16:14:25 -07:00
commit d1cc29f412
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Controller/Controller.php
View file

@ -265,7 +265,7 @@ class Controller extends Object implements CakeEventListener {
public $methods = array(); 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. * the controller's $name property.
* *
* Example: For a controller named 'Comments', the modelClass would be 'Comment' * 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) { foreach ($this->uses as $modelClass) {
list($plugin, $class) = pluginSplit($modelClass, true); list($plugin, $class) = pluginSplit($modelClass, true);
if ($name === $class) { if ($name === $class) {
if (!$plugin) {
$plugin = $this->plugin ? $this->plugin . '.' : null;
}
return $this->loadModel($modelClass); return $this->loadModel($modelClass);
} }
} }