From 95aa7e32c3bc58f941ec1c42ae1afc2b41edaacc Mon Sep 17 00:00:00 2001 From: Ceeram Date: Mon, 23 Jan 2012 10:57:10 +0100 Subject: [PATCH] include theme in _passedVars array --- lib/Cake/View/View.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index db5db15b1..d11b20bfe 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -157,7 +157,7 @@ class View extends Object { public $subDir = null; /** - * Theme name. If you are using themes, you should remember to use ThemeView as well. + * Theme name. * * @var string */ @@ -217,7 +217,7 @@ class View extends Object { * @var 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' ); @@ -305,9 +305,6 @@ class View extends Object { $this->{$var} = $controller->{$var}; } $this->_eventManager = $controller->getEventManager(); - if (!empty($controller->theme)) { - $this->theme = $controller->theme; - } } $this->Helpers = new HelperCollection($this); $this->Blocks = new ViewBlock();