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, 6 insertions, 8 deletions

diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index 12ce8564a..bef1cc094 100644
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -33,8 +33,6 @@ $area1 .= elgg_view("profile/edit",array('entity' => $user));
 	
 elgg_set_context('profile_edit');
 
-// get the required canvas area
-$body = elgg_view_layout("one_column_with_sidebar", $area1);
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area1));
 	
-// Draw the page
-echo elgg_view_page(elgg_echo("profile:edit"),$body);
+echo elgg_view_page(elgg_echo("profile:edit"), $body);
diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php
index 4c19937b2..85b06cc17 100644
--- a/mod/profile/editicon.php
+++ b/mod/profile/editicon.php
@@ -33,7 +33,7 @@ $area1 .= elgg_view("profile/edit_icon", array('user' => $user));
 elgg_set_context('profile_edit');
 
 // Get the form and correct canvas area
-$body = elgg_view_layout("one_column_with_sidebar", $area1);
+$body = elgg_view_layout("one_column_with_sidebar", array('content' => $area1));
 	
 // Draw the page
 echo elgg_view_page(elgg_echo("profile:editicon"), $body);
diff --git a/mod/profile/index.php b/mod/profile/index.php
index bf47d670c..7c9c0a3cc 100644
--- a/mod/profile/index.php
+++ b/mod/profile/index.php
@@ -45,5 +45,5 @@ if ($user = get_user_by_username($username)) {
 	$body = elgg_echo("profile:notfound");
 	$title = elgg_echo("profile");
 }
-$body = elgg_view_layout("one_column", $body);
+$body = elgg_view_layout("one_column", array('content' => $body));
 echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 6e9a43a68..1ba2e6dc5 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -145,7 +145,7 @@ function profile_page_handler($page) {
 			}
 
 			$content = profile_get_user_edit_content($user, $page);
-			$content = elgg_view_layout($layout, $content);
+			$content = elgg_view_layout($layout, array('content' => $content));
 			break;
 
 		default:
@@ -156,7 +156,7 @@ function profile_page_handler($page) {
 				$section = 'activity';
 			}
 			$content = profile_get_user_profile_html($user, $section);
-			$content = elgg_view_layout($layout, $content);
+			$content = elgg_view_layout($layout, array('content' => $content));
 			break;
 	}