Fixes #2640 - elgg_view_layout now uses a parameter array like all the other elgg_view* functions

git-svn-id: http://code.elgg.org/elgg/trunk@7288 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 19 insertions, 7 deletions

diff --git a/mod/file/edit.php b/mod/file/edit.php
index 5c2afc120..961332420 100644
--- a/mod/file/edit.php
+++ b/mod/file/edit.php
@@ -34,5 +34,5 @@ $title = elgg_echo('file:edit');
 $area1 = elgg_view_title($title);
 $area1 .= elgg_view("file/upload", array('entity' => $file));
 
-$body = elgg_view_layout('one_column_with_sidebar', $area1);
+$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 echo elgg_view_page($title, $body);
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 895105480..32eeeffd8 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -34,7 +34,11 @@
 	$area3 = elgg_view('annotation/latest_comments', array('comments' => $comments));
 
 	$content = "<div class='files'>".$area1.$area2."</div>";
-	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
+	$params = array(
+		'content' => $content,
+		'sidebar' => $area3
+	);
+	$body = elgg_view_layout('one_column_with_sidebar', $params);
 
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/file/index.php b/mod/file/index.php
index 21d573b2b..65144b7bb 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -40,7 +40,12 @@
 	$area3 = elgg_view('annotation/latest_comments', array('comments' => $comments));
 
 	$content = "<div class='files'>".$area1.$area2."</div>";
-	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
+
+	$params = array(
+		'content' => $content,
+		'sidebar' => $area3
+	);
+	$body = elgg_view_layout('one_column_with_sidebar', $params);
 
 	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/file/search.php b/mod/file/search.php
index b0120d932..8dd4669a9 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -92,7 +92,7 @@
 
 		$content = "<div class='files'>".$area1.$area2."</div>";
 
-		$body = elgg_view_layout('one_column_with_sidebar', $content);
+		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
 
 		echo elgg_view_page($title, $body);
 
diff --git a/mod/file/upload.php b/mod/file/upload.php
index 975b8e66a..2040c7240 100644
--- a/mod/file/upload.php
+++ b/mod/file/upload.php
@@ -17,7 +17,7 @@
 	$container_guid = elgg_get_page_owner_guid();
 	$area1 = elgg_view_title($title = elgg_echo('file:upload'));
 	$area1 .= elgg_view("file/upload", array('container_guid' => $container_guid));
-	$body = elgg_view_layout('one_column_with_sidebar', $area1);
+	$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area1));
 	
 	echo elgg_view_page(elgg_echo("file:upload"), $body);
 	
diff --git a/mod/file/world.php b/mod/file/world.php
index a3d78ef7b..bd6c2b859 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -31,7 +31,10 @@
 	$area3 = elgg_view('annotation/latest_comments', array('comments' => $comments));
 	
 	$content = "<div class='files'>".$area1.$area2."</div>";
-		
-	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
+	$params = array(
+		'content' => $content,
+		'sidebar' => $area3
+	);
+	$body = elgg_view_layout('one_column_with_sidebar', $params);
 
 	echo elgg_view_page($title, $body);