adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing conditional calling of View::_render() as a static method.

Browse source 
Updating doc blocks.
This commit is contained in:
mark_story 2009-08-20 01:15:08 -04:00
parent 3b95b4c95d
commit add1dede86
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cake/libs/view/view.php
View file

@ -326,7 +326,7 @@ class View extends Object {
* @param string $name Name of template file in the/app/views/elements/ folder * @param string $name Name of template file in the/app/views/elements/ folder
* @param array $params Array of data to be made available to the for rendered * @param array $params Array of data to be made available to the for rendered
* view (i.e. the Element) * view (i.e. the Element)
* Special params: * Special params:
* cache - enable caching for this element accepts boolean or strtotime compatible string. * cache - enable caching for this element accepts boolean or strtotime compatible string.
* Can also be an array * Can also be an array
* if an array,'time' is used to specify duration of cache. 'key' can be used to * if an array,'time' is used to specify duration of cache. 'key' can be used to
@ -413,11 +413,7 @@ class View extends Object {
} }
if ($action !== false && $viewFileName = $this->_getViewFileName($action)) { if ($action !== false && $viewFileName = $this->_getViewFileName($action)) {
if (substr($viewFileName, -3) === 'ctp' || substr($viewFileName, -5) === 'thtml') { $out = $this->_render($viewFileName, $this->viewVars);
$out = View::_render($viewFileName, $this->viewVars);
} else {
$out = $this->_render($viewFileName, $this->viewVars);
}
} }
if ($layout === null) { if ($layout === null) {
@ -449,10 +445,11 @@ class View extends Object {
/** /**
* Renders a layout. Returns output from _render(). Returns false on error. * Renders a layout. Returns output from _render(). Returns false on error.
* Several variables are created for use in layout. * Several variables are created for use in layout.
* title_for_layout - contains page title *
* content_for_layout - contains rendered view file * - `title_for_layout` - contains page title
* scripts_for_layout - contains scripts added to header * - `content_for_layout` - contains rendered view file
* cakeDebug - if debug is on, cake debug information is added. * - `scripts_for_layout` - contains scripts added to header
* - `cakeDebug` - if debug is on, cake debug information is added.
* *
* @param string $content_for_layout Content to render in a view, wrapped by the surrounding layout. * @param string $content_for_layout Content to render in a view, wrapped by the surrounding layout.
* @return mixed Rendered output, or false on error * @return mixed Rendered output, or false on error
@ -491,12 +488,7 @@ class View extends Object {
} }
$this->_triggerHelpers('beforeLayout'); $this->_triggerHelpers('beforeLayout');
$this->output = $this->_render($layoutFileName, $data_for_layout, $loadHelpers);
if (substr($layoutFileName, -3) === 'ctp' || substr($layoutFileName, -5) === 'thtml') {
$this->output = View::_render($layoutFileName, $data_for_layout, $loadHelpers, true);
} else {
$this->output = $this->_render($layoutFileName, $data_for_layout, $loadHelpers);
}
if ($this->output === false) { if ($this->output === false) {
$this->output = $this->_render($layoutFileName, $data_for_layout); $this->output = $this->_render($layoutFileName, $data_for_layout);