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

2 files changed, 7 insertions, 3 deletions

diff --git a/mod/sitepages/index.php b/mod/sitepages/index.php
index f1f6585da..053f82996 100644
--- a/mod/sitepages/index.php
+++ b/mod/sitepages/index.php
@@ -36,6 +36,10 @@ $members = elgg_get_entities_from_metadata(array(
 //include sidebar free text

 $sidebar = elgg_view('sitepages/sidebar');

 $sidebar .= elgg_view('sitepages/members', array('members' => $members));

-		

-$content = elgg_view_layout('frontpage', $content, $sidebar);

+

+$params = array(

+	'content' => $content,

+	'sidebar' => $sidebar

+);

+$content = elgg_view_layout('frontpage', $params);

 echo elgg_view_page(null, $content);

diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php
index 38c793074..f1dfdd047 100644
--- a/mod/sitepages/sitepages_functions.php
+++ b/mod/sitepages/sitepages_functions.php
@@ -97,7 +97,7 @@ function sitepages_get_page_content($page_type) {
 		$body .= elgg_view('page_elements/content', array('body' => elgg_echo('sitepages:notset')));
 	}
 
-	$content = elgg_view_layout('one_column_with_sidebar', $body);
+	$content = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
 	return $content;
 }