adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-08 04:22:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding constants and a property to track the current type.

Browse source 
This helps with resolving parent elements.
This commit is contained in:
mark_story 2011-09-29 22:22:03 -04:00
parent 9b2fd8f251
commit d8c6594ff6
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/Cake/View/View.php
View file

@ -248,7 +248,7 @@ class View extends Object {
protected $_parents = array();
/**
* The currently rendering view file.
* The currently rendering view file. Used for resolving parent files.
*
* @var string
*/
@ -258,9 +258,9 @@ class View extends Object {
* Currently rendering an element. Used for finding parent fragments
* for elements.
*
* @var boolean
* @var string
*/
protected $_inElement = false;
protected $_currentType = '';
/**
* Content stack, used for nested templates that all use View::extend();
@ -269,6 +269,10 @@ class View extends Object {
*/
protected $_stack = array();
const TYPE_VIEW = 'view';
const TYPE_ELEMENT = 'element';
const TYPE_LAYOUT = 'layout';
/**
* Constructor
*
@ -353,9 +357,8 @@ class View extends Object {
$this->Helpers->trigger('beforeRender', array($file));
}
$this->_inElement = true;
$this->_currentType = self::TYPE_ELEMENT;
$element = $this->_render($file, array_merge($this->viewVars, $data));
$this->_inElement = false;
if ($callbacks) {
$this->Helpers->trigger('afterRender', array($file, $element));
@ -400,6 +403,7 @@ class View extends Object {
$this->output = null;
if ($view !== false && $viewFileName = $this->_getViewFileName($view)) {
$this->_currentType = self::TYPE_VIEW;
$this->Helpers->trigger('beforeRender', array($viewFileName));
$this->output = $this->_render($viewFileName);
$this->Helpers->trigger('afterRender', array($viewFileName));
@ -462,7 +466,7 @@ class View extends Object {
if (!isset($this->viewVars['title_for_layout'])) {
$this->viewVars['title_for_layout'] = Inflector::humanize($this->viewPath);
}
$this->_currentType = self::TYPE_LAYOUT;
$this->output = $this->_render($layoutFileName);
if ($this->output === false) {
@ -618,10 +622,17 @@ class View extends Object {
* @return void
*/
public function extend($name) {
if ($this->_inElement) {
$parent = $this->_getElementFileName($name);
} else {
$parent = $this->_getViewFileName($name);
switch ($this->_currentType) {
case self::TYPE_VIEW:
$parent = $this->_getViewFileName($name);
break;
case self::TYPE_ELEMENT:
$parent = $this->_getElementFileName($name);
break;
case self::TYPE_LAYOUT:
$parent = $this->_getLayoutFileName($name);
break;
}
$this->_parents[$this->_current] = $parent;
}