Update default layouts to use blocks.

cakephp · Dec 18, 2011 · 0b0a69d · 0b0a69d
1 parent 46bb6c8
commit 0b0a69d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git 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');
 	?>
 </head>
 <body>
@@ -41,8 +43,7 @@
 
 			<?php echo $this->Session->flash(); ?>
 
-			<?php echo $content_for_layout; ?>
-
+			<?php echo $this->fetch('content'); ?>
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
@@ -55,4 +56,4 @@
 	</div>
 	<?php echo $this->element('sql_dump'); ?>
 </body>
-</html>
+</html>
diff --git 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');
 	?>
 </head>
 <body>
@@ -43,8 +45,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 
 			<?php echo $this->Session->flash(); ?>
 
-			<?php echo $content_for_layout; ?>
-
+			<?php echo $this->fetch('content'); ?>
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
@@ -57,4 +58,4 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 	</div>
 	<?php echo $this->element('sql_dump'); ?>
 </body>
-</html>
+</html>
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
@@ -586,7 +586,8 @@ public function assign($name, $value) {
 	}
 
 /**
- * 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.