adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-05-20 14:33:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include theme in _passedVars array

Browse source
This commit is contained in:
Ceeram 2012-01-23 10:57:10 +01:00
parent 4f1be12046
commit 95aa7e32c3
1 changed files with 2 additions and 5 deletions

7
lib/Cake/View/View.php
View file

@ -157,7 +157,7 @@ class View extends Object {
public $subDir = null; public $subDir = null;
/** /**
* Theme name. If you are using themes, you should remember to use ThemeView as well. * Theme name.
* *
* @var string * @var string
*/ */
@ -217,7 +217,7 @@ class View extends Object {
* @var array * @var array
*/ */
protected $_passedVars = array( protected $_passedVars = array(
'viewVars', 'autoLayout', 'ext', 'helpers', 'view', 'layout', 'name', 'viewVars', 'autoLayout', 'ext', 'helpers', 'view', 'layout', 'name', 'theme',
'layoutPath', 'viewPath', 'request', 'plugin', 'passedArgs', 'cacheAction' 'layoutPath', 'viewPath', 'request', 'plugin', 'passedArgs', 'cacheAction'
); );
@ -305,9 +305,6 @@ class View extends Object {
$this->{$var} = $controller->{$var}; $this->{$var} = $controller->{$var};
} }
$this->_eventManager = $controller->getEventManager(); $this->_eventManager = $controller->getEventManager();
if (!empty($controller->theme)) {
$this->theme = $controller->theme;
}
} }
$this->Helpers = new HelperCollection($this); $this->Helpers = new HelperCollection($this);
$this->Blocks = new ViewBlock(); $this->Blocks = new ViewBlock();