diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 255319d72e6..907e5576a85 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -236,15 +236,6 @@ class Controller extends Object { */ public $cacheAction = false; -/** - * Used to create cached instances of models a controller uses. - * When set to true, all models related to the controller will be cached. - * This can increase performance in many cases. - * - * @var boolean - */ - public $persistModel = false; - /** * Holds all params passed and named. * @@ -593,8 +584,6 @@ public function httpCodes($code = null) { /** * Loads and instantiates models required by this controller. - * If Controller::$persistModel; is true, controller will cache model instances on first request, - * additional request will used cached models. * If the model is non existent, it will throw a missing database table error, as Cake generates * dynamic models for the time being. * @@ -607,36 +596,16 @@ public function loadModel($modelClass = null, $id = null) { if ($modelClass === null) { $modelClass = $this->modelClass; } - $cached = false; - $object = null; list($plugin, $modelClass) = pluginSplit($modelClass, true); - if ($this->persistModel === true) { - $cached = $this->_persist($modelClass, null, $object); - } - - if (($cached === false)) { - $this->modelNames[] = $modelClass; + $this->modelNames[] = $modelClass; - $this->{$modelClass} = ClassRegistry::init(array( - 'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id - )); - - if (!$this->{$modelClass}) { - throw new MissingModelException($modelClass); - } - - if ($this->persistModel === true) { - $this->_persist($modelClass, true, $this->{$modelClass}); - $registry = ClassRegistry::getInstance(); - $this->_persist($modelClass . 'registry', true, $registry->__objects, 'registry'); - } - } else { - $this->_persist($modelClass . 'registry', true, $object, 'registry'); - $this->_persist($modelClass, true, $object); - $this->modelNames[] = $modelClass; + $this->{$modelClass} = ClassRegistry::init(array( + 'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id + )); + if (!$this->{$modelClass}) { + throw new MissingModelException($modelClass); } - return true; } diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 04589053135..7cf05031f1b 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -513,29 +513,6 @@ public function testAliasName() { unset($Controller); } -/** - * testPersistent method - * - * @access public - * @return void - */ - public function testPersistent() { - $this->markTestIncomplete('persistModel is totally broken right now.'); - - Configure::write('Cache.disable', false); - $Controller = new Controller(); - $Controller->modelClass = 'ControllerPost'; - $Controller->persistModel = true; - $Controller->constructClasses(); - $this->assertTrue(file_exists(CACHE . 'persistent' . DS .'controllerpost.php')); - $this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost')); - @unlink(CACHE . 'persistent' . DS . 'controllerpost.php'); - @unlink(CACHE . 'persistent' . DS . 'controllerpostregistry.php'); - - unset($Controller); - Configure::write('Cache.disable', true); - } - /** * testFlash method *