adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/2.0' into 2.0-class-loading

Browse source 
Conflicts:
	cake/libs/view/helpers/js.php
	lib/Cake/Console/Command/Task/FixtureTask.php
This commit is contained in:
José Lorenzo Rodríguez 2011-01-09 23:32:05 -04:30
commit 1332561164
20 changed files with 281 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -243,6 +243,7 @@ class CacheHelper extends AppHelper {
$controller->layout = $this->layout = \'' . $this->_View->layout. '\';
$controller->request = $this->request = unserialize(\'' . str_replace("'", "\\'", serialize($this->request)) . '\');
$controller->theme = $this->theme = \'' . $this->_View->theme . '\';
$controller->viewVars = $this->viewVars = ' . var_export($this->_View->viewVars, true) . ';
Router::setRequestInfo($controller->request);';
if ($useCallbacks == true) {
@ -253,6 +254,7 @@ class CacheHelper extends AppHelper {
$file .= '
$this->loadHelpers();
extract($this->viewVars, EXTR_SKIP);
?>';
$content = preg_replace("/(<\\?xml)/", "<?php echo '$1';?>",$content);
$file .= $content;