adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving beforeLayout, before additional viewVars are processed. Refs #624

Browse source
This commit is contained in:
Mark Story 2010-10-31 23:07:18 -04:00 committed by mark_story
parent 09d3a0626a
commit 157bdfafc6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,6 +423,7 @@ class View extends Object {
if (empty($layoutFileName)) { if (empty($layoutFileName)) {
return $this->output; return $this->output;
} }
$this->Helpers->trigger('beforeLayout', array(&$this));
$dataForLayout = array_merge($this->viewVars, array( $dataForLayout = array_merge($this->viewVars, array(
'content_for_layout' => $content_for_layout, 'content_for_layout' => $content_for_layout,
@ -441,7 +442,6 @@ class View extends Object {
$dataForLayout = array_merge($dataForLayout); $dataForLayout = array_merge($dataForLayout);
} }
$this->Helpers->trigger('beforeLayout', array(&$this));
$this->output = $this->_render($layoutFileName, $dataForLayout, $loadHelpers, true); $this->output = $this->_render($layoutFileName, $dataForLayout, $loadHelpers, true);
if ($this->output === false) { if ($this->output === false) {