adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing baking views for models in plugins. Making sure that the temporary controller object gets its plugin property set so the correct models are loaded and used. Fixes #381

Browse source
This commit is contained in:
Mark Story 2010-02-27 20:28:04 -05:00
parent ec5d9729b0
commit 748ec4ee78
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/console/libs/tasks/view.php
View file

@ -289,9 +289,10 @@ class ViewTask extends Shell {
} }
$controllerClassName = $this->controllerName . 'Controller'; $controllerClassName = $this->controllerName . 'Controller';
$controllerObj =& new $controllerClassName(); $controllerObj =& new $controllerClassName();
$controllerObj->plugin = $this->plugin;
$controllerObj->constructClasses(); $controllerObj->constructClasses();
$modelClass = $controllerObj->modelClass; $modelClass = $controllerObj->modelClass;
$modelObj =& ClassRegistry::getObject($controllerObj->modelKey); $modelObj =& $controllerObj->{$controllerObj->modelClass};
if ($modelObj) { if ($modelObj) {
$primaryKey = $modelObj->primaryKey; $primaryKey = $modelObj->primaryKey;
@ -302,13 +303,10 @@ class ViewTask extends Shell {
$fields = array_keys($schema); $fields = array_keys($schema);
$associations = $this->__associations($modelObj); $associations = $this->__associations($modelObj);
} else { } else {
$primaryKey = null; $primaryKey = $displayField = null;
$displayField = null;
$singularVar = Inflector::variable(Inflector::singularize($this->controllerName)); $singularVar = Inflector::variable(Inflector::singularize($this->controllerName));
$singularHumanName = $this->_singularHumanName($this->controllerName); $singularHumanName = $this->_singularHumanName($this->controllerName);
$fields = array(); $fields = $schema = $associations = array();
$schema = array();
$associations = array();
} }
$pluralVar = Inflector::variable($this->controllerName); $pluralVar = Inflector::variable($this->controllerName);
$pluralHumanName = $this->_pluralHumanName($this->controllerName); $pluralHumanName = $this->_pluralHumanName($this->controllerName);