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

Removing local and using output property.

Browse source
This commit is contained in:
mark_story 2010-11-04 23:50:59 -04:00
parent 2e140a9fd3
commit 2dff74d037
1 changed files with 7 additions and 7 deletions

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

@ -392,7 +392,7 @@ class View extends Object {
if (!$this->_helpersLoaded) { if (!$this->_helpersLoaded) {
$this->loadHelpers(); $this->loadHelpers();
} }
$out = null; $this->output = null;
if ($file != null) { if ($file != null) {
$action = $file; $action = $file;
@ -400,18 +400,18 @@ class View extends Object {
if ($action !== false && $viewFileName = $this->_getViewFileName($action)) { if ($action !== false && $viewFileName = $this->_getViewFileName($action)) {
$this->Helpers->trigger('beforeRender', array($viewFileName)); $this->Helpers->trigger('beforeRender', array($viewFileName));
$out = $this->_render($viewFileName); $this->output = $this->_render($viewFileName);
$this->Helpers->trigger('afterRender', array($viewFileName, $out)); $this->Helpers->trigger('afterRender', array($viewFileName, $this->output));
} }
if ($layout === null) { if ($layout === null) {
$layout = $this->layout; $layout = $this->layout;
} }
if ($out === false) { if ($this->output === false) {
throw new RuntimeException(sprintf(__("Error in view %s, got no content."), $viewFileName)); throw new RuntimeException(sprintf(__("Error in view %s, got no content."), $viewFileName));
} }
if ($layout && $this->autoLayout) { if ($layout && $this->autoLayout) {
$out = $this->renderLayout($out, $layout); $this->output = $this->renderLayout($this->output, $layout);
$isCached = ( $isCached = (
isset($this->Helpers->Cache) || isset($this->Helpers->Cache) ||
Configure::read('Cache.check') === true Configure::read('Cache.check') === true
@ -419,11 +419,11 @@ class View extends Object {
if ($isCached) { if ($isCached) {
$replace = array('<cake:nocache>', '</cake:nocache>'); $replace = array('<cake:nocache>', '</cake:nocache>');
$out = str_replace($replace, '', $out); $this->output = str_replace($replace, '', $this->output);
} }
} }
$this->hasRendered = true; $this->hasRendered = true;
return $out; return $this->output;
} }
/** /**