From 0b0a69de1ebd318b47396c8c1891e8687eef062b Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 17 Dec 2011 21:41:06 -0500 Subject: [PATCH] Update default layouts to use blocks. --- lib/Cake/Console/Templates/skel/View/Layouts/default.ctp | 9 +++++---- lib/Cake/View/Layouts/default.ctp | 9 +++++---- lib/Cake/View/View.php | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp b/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp index c20d170e8..c7d67871f 100644 --- a/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp +++ b/lib/Cake/Console/Templates/skel/View/Layouts/default.ctp @@ -29,7 +29,9 @@ echo $this->Html->css('cake.generic'); - echo $scripts_for_layout; + echo $this->fetch('meta'); + echo $this->fetch('css'); + echo $this->fetch('script'); ?> @@ -41,8 +43,7 @@ Session->flash(); ?> - - + fetch('content'); ?> element('sql_dump'); ?> - \ No newline at end of file + diff --git a/lib/Cake/View/Layouts/default.ctp b/lib/Cake/View/Layouts/default.ctp index 5153c9152..49477342e 100644 --- a/lib/Cake/View/Layouts/default.ctp +++ b/lib/Cake/View/Layouts/default.ctp @@ -31,7 +31,9 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework echo $this->Html->css('cake.generic'); - echo $scripts_for_layout; + echo $this->fetch('meta'); + echo $this->fetch('css'); + echo $this->fetch('script'); ?> @@ -43,8 +45,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework Session->flash(); ?> - - + fetch('content'); ?> element('sql_dump'); ?> - \ No newline at end of file + diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index dd05dc997..f9ca56e5c 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -586,7 +586,8 @@ class View extends Object { } /** - * Fetch the content for a block. + * Fetch the content for a block. If a block is + * empty or undefined '' will be returnned. * * @param string $name Name of the block * @return The block content or '' if the block does not exist.