Fix issue with scripts_for_layout compatibility.

This commit is contained in:
mark_story 2011-12-29 11:58:05 -05:00
parent 5936fa5930
commit 9cdf8042bf

View file

@ -493,7 +493,7 @@ class View extends Object {
$this->getEventManager()->dispatch(new CakeEvent('View.beforeLayout', $this, array($layoutFileName))); $this->getEventManager()->dispatch(new CakeEvent('View.beforeLayout', $this, array($layoutFileName)));
$scripts = implode("\n\t", $this->_scripts); $scripts = implode("\n\t", $this->_scripts);
$scripts .= $this->get('meta') . $this->get('css') . $this->get('script'); $scripts .= $this->Blocks->get('meta') . $this->Blocks->get('css') . $this->Blocks->get('script');
$this->viewVars = array_merge($this->viewVars, array( $this->viewVars = array_merge($this->viewVars, array(
'content_for_layout' => $content, 'content_for_layout' => $content,