Updating core layout, and skel layout to reflect changes in session->…

…flash(). Updating skel layout to use $this->Helper.
cakephp · Nov 17, 2009 · 925fda7 · 925fda7
1 parent e6801c2
commit 925fda7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cake/console/templates/skel/views/layouts/default.ctp b/cake/console/templates/skel/views/layouts/default.ctp
@@ -20,34 +20,34 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<?php echo $html->charset(); ?>
+	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php __('CakePHP: the rapid development php framework:'); ?>
 		<?php echo $title_for_layout; ?>
 	</title>
 	<?php
-		echo $html->meta('icon');
+		echo $this->Html->meta('icon');
 
-		echo $html->css('cake.generic');
+		echo $this->Html->css('cake.generic');
 
 		echo $scripts_for_layout;
 	?>
 </head>
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
-			<?php $session->flash(); ?>
+			<?php echo $this->Session->flash(); ?>
 
 			<?php echo $content_for_layout; ?>
 
 		</div>
 		<div id="footer">
-			<?php echo $html->link(
-					$html->image('cake.power.gif', array('alt'=>__("CakePHP: the rapid development php framework", true), 'border'=>"0")),
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
 					'http://www.cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);

diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
@@ -40,7 +40,7 @@
 		</div>
 		<div id="content">
 
-			<?php $this->Session->flash(); ?>
+			<?php echo $this->Session->flash(); ?>
 
 			<?php echo $content_for_layout; ?>