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

Adding Backwards compatibility for $scripts_for_layout.

Browse source
This commit is contained in:
Mark Story 2011-08-16 21:26:54 -04:00 • committed by mark_story
parent 4606ea39a9
commit 6d425dfbcb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Cake/View/View.php
View file

@ -396,7 +396,10 @@ class View extends Object {
* *
* - `title_for_layout` - A backwards compatible place holder, you should set this value if you want more control. * - `title_for_layout` - A backwards compatible place holder, you should set this value if you want more control.
* - `content_for_layout` - contains rendered view file * - `content_for_layout` - contains rendered view file
* - `scripts_for_layout` - contains scripts added to header * - `scripts_for_layout` - Contains content added with addScript() as well as any content in
* the 'meta', 'css', and 'script' blocks. They are appended in that order.
*
* `$scripts_for_layout` is deprecated and will be removed in CakePHP 3.0
* *
* @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.
* @param string $layout Layout name * @param string $layout Layout name
@ -413,9 +416,12 @@ class View extends Object {
} }
$this->Helpers->trigger('beforeLayout', array($layoutFileName)); $this->Helpers->trigger('beforeLayout', array($layoutFileName));
$scripts = implode("\n\t", $this->_scripts);
$scripts .= $this->get('meta') . $this->get('css') . $this->get('script');
$this->viewVars = array_merge($this->viewVars, array( $this->viewVars = array_merge($this->viewVars, array(
'content_for_layout' => $content_for_layout, 'content_for_layout' => $content_for_layout,
'scripts_for_layout' => implode("\n\t", $this->_scripts), 'scripts_for_layout' => $scripts,
)); ));
if (!isset($this->viewVars['title_for_layout'])) { if (!isset($this->viewVars['title_for_layout'])) {