Fixed canvas layout for profile edit views

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

diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index 9894ce35d21d022682acc738263ecea66eee3a47..91db99a2ec6a17b28f633edac5d081fa1d188f08 100644 (file)
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -32,15 +32,13 @@ if (!$user->canEdit()) {
 }
 
 // Get edit form
-$area2 = elgg_view_title(elgg_echo('profile:edit'));
-$area2 .= elgg_view("profile/edit",array('entity' => $user)); 
-
-$area1 = "";
+$area1 = elgg_view_title(elgg_echo('profile:edit'));
+$area1 .= elgg_view("profile/edit",array('entity' => $user)); 
        
 set_context('profile_edit');
 
 // get the required canvas area
-$body = elgg_view_layout("one_column_with_sidebar", $area2, $area1);
+$body = elgg_view_layout("one_column_with_sidebar", $area1);
        
 // Draw the page
 page_draw(elgg_echo("profile:edit"),$body);

diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php
index 65b4b10daf4ce1e6542b81818c25ed144e9448c3..0e73c8d810aabc9f8f2fba4c85f91645dd49eca6 100644 (file)
--- a/mod/profile/editicon.php
+++ b/mod/profile/editicon.php
@@ -31,13 +31,13 @@ if (!$user->canEdit()) {
 }
 
 // set title
-$area2 = elgg_view_title(elgg_echo('profile:createicon:header'));
-$area2 .= elgg_view("profile/edit_icon", array('user' => $user));
+$area1 = elgg_view_title(elgg_echo('profile:createicon:header'));
+$area1 .= elgg_view("profile/edit_icon", array('user' => $user));
 
 set_context('profile_edit');
 
 // Get the form and correct canvas area
-$body = elgg_view_layout("one_column_with_sidebar", $area2);
+$body = elgg_view_layout("one_column_with_sidebar", $area1);
        
 // Draw the page
 page_draw(elgg_echo("profile:editicon"), $body);

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 8a78be3d935f71a451e09aeab0060cb83a30adaf..3ba2b391587449dbf4b5717827ba48d51101854e 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -154,7 +154,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, $content);
                        break;
 
                default: