From ff4779ddb3ef005553187e4486d4d775220d8b8f Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 9 Mar 2010 09:39:34 +0000
Subject: Updated new page canvases (and calls to elgg_view_layout) so that
 empty vars are not required.

git-svn-id: http://code.elgg.org/elgg/trunk@5316 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/canvas/layouts/one_column_with_sidebar.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'views/default/canvas')

diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index f7fff4d08..d7271c9c3 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -12,12 +12,14 @@
 	<div id="elgg_sidebar">
 		<?php 
 			echo elgg_view('page_elements/owner_block'); 
-			if (isset($vars['area1'])) echo $vars['area1'];
-			if (isset($vars['area3'])) echo $vars['area3']; 
+			if (isset($vars['area2'])) echo $vars['area2']; 
+			if (isset($vars['area3'])) echo $vars['area3'];	
 		?>
 	</div>
 	
 	<div id="elgg_page_contents" class="clearfloat">
-		<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
+		<?php 
+			if (isset($vars['area1'])) echo $vars['area1'];
+		?>
 	</div>
 </div>
-- 
cgit v1.2.3