Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

include theme in _passedVars array

  • Loading branch information...
commit 95aa7e32c3bc58f941ec1c42ae1afc2b41edaacc 1 parent 4f1be12
@ceeram ceeram authored
Showing with 2 additions and 5 deletions.
  1. +2 −5 lib/Cake/View/View.php
View
7 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 @@ public function __construct($controller) {
$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();
Please sign in to comment.
Something went wrong with that request. Please try again.