aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-09 11:59:41 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-09 11:59:41 +0000
commit22b5a8e6601b342e52eaad3a4dbfbee583047f68 (patch)
treebd72eb0686dd4fa9ee298cc0694af65ad4431679
parent31db19e91841abc92ca1180d52e9f5f5b3a527be (diff)
downloadelgg-22b5a8e6601b342e52eaad3a4dbfbee583047f68.tar.gz
elgg-22b5a8e6601b342e52eaad3a4dbfbee583047f68.tar.bz2
Fixed canvas layout for profile edit views
git-svn-id: http://code.elgg.org/elgg/trunk@5321 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/profile/edit.php8
-rw-r--r--mod/profile/editicon.php6
-rw-r--r--mod/profile/start.php2
3 files changed, 7 insertions, 9 deletions
diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index 9894ce35d..91db99a2e 100644
--- 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 65b4b10da..0e73c8d81 100644
--- 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 8a78be3d9..3ba2b3915 100644
--- 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: