adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move viewVars assignment after callbacks.

Browse source 
Assigning the controller viewVars after callbacks
allows the controller callbacks to assign additional
viewVars, or manipulate existing ones.

Fixes #2335
This commit is contained in:
mark_story 2011-12-03 14:45:21 -05:00
parent 0670b96c24
commit 457dd73ed0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/View/Helper/CacheHelper.php
View file

@ -283,7 +283,7 @@ class CacheHelper extends AppHelper {
$controller->helpers = $this->helpers = unserialize(base64_decode(\'' . base64_encode(serialize($this->_View->helpers)) . '\')); $controller->helpers = $this->helpers = unserialize(base64_decode(\'' . base64_encode(serialize($this->_View->helpers)) . '\'));
$controller->layout = $this->layout = \'' . $this->_View->layout. '\'; $controller->layout = $this->layout = \'' . $this->_View->layout. '\';
$controller->theme = $this->theme = \'' . $this->_View->theme . '\'; $controller->theme = $this->theme = \'' . $this->_View->theme . '\';
$controller->viewVars = $this->viewVars = unserialize(base64_decode(\'' . base64_encode(serialize($this->_View->viewVars)) . '\')); $controller->viewVars = unserialize(base64_decode(\'' . base64_encode(serialize($this->_View->viewVars)) . '\'));
Router::setRequestInfo($controller->request); Router::setRequestInfo($controller->request);
$this->request = $request;'; $this->request = $request;';
@ -294,6 +294,7 @@ class CacheHelper extends AppHelper {
} }
$file .= ' $file .= '
$this->viewVars = $controller->viewVars;
$this->loadHelpers(); $this->loadHelpers();
extract($this->viewVars, EXTR_SKIP); extract($this->viewVars, EXTR_SKIP);
?>'; ?>';