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

4 files changed, 12 insertions, 4 deletions

diff --git a/mod/messages/index.php b/mod/messages/index.php
index 16049f918..5b79a54ae 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -42,7 +42,7 @@ $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_vie
 //$area3 = elgg_view("messages/menu_options", array('context' => 'inbox'));
 
 // format
-$body = elgg_view_layout("one_column_with_sidebar", $area2);
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
 
 
 // Draw page
diff --git a/mod/messages/read.php b/mod/messages/read.php
index 740011c3e..4e404de5c 100644
--- a/mod/messages/read.php
+++ b/mod/messages/read.php
@@ -48,7 +48,11 @@ $content = elgg_view("messages/messages",array(
 
 $sidebar = elgg_view("messages/menu_options");
 
-$body = elgg_view_layout("one_column_with_sidebar", $content, $sidebar);
+$params = array(
+	'content' => $content,
+	'sidebar' => $sidebar
+);
+$body = elgg_view_layout("one_column_with_sidebar", $params);
 
 // Display page
 echo elgg_view_page(elgg_echo('messages:message'), $body);
\ No newline at end of file
diff --git a/mod/messages/send.php b/mod/messages/send.php
index 359c38ae1..3e1baa496 100644
--- a/mod/messages/send.php
+++ b/mod/messages/send.php
@@ -32,7 +32,11 @@ $area2 .= elgg_view("messages/forms/send",array('friends' => $friends));
 $area3 = elgg_view("messages/menu_options");
 
 // Format
-$body = elgg_view_layout("one_column_with_sidebar", $area2, $area3);
+$params = array(
+	'content' => $area2,
+	'sidebar' => $area3
+);
+$body = elgg_view_layout("one_column_with_sidebar", $params);
 
 // Draw page
 echo elgg_view_page(elgg_echo('messages:send', array($page_owner->name)), $body);
\ No newline at end of file
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index bb0746c80..89771d6b7 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -34,7 +34,7 @@ $area2 .= "<div class='content_header_options'><a class='action_button' href='".
 $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
 
 // Format
-$body = elgg_view_layout("one_column_with_sidebar", $area2);
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area2));
 
 // Draw page
 echo elgg_view_page(elgg_echo('messages:sentMessages', array($page_owner->name)), $body);