aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-12 20:24:50 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-12 20:24:50 +0000
commit4c84500ceeb484df84d116257e28b4924f2a7740 (patch)
tree33ce79c6747d0292a1c6721da1fd2996530f34de
parentd5a7df88aad025f1e7e7be4107faa4cc5610bdb8 (diff)
downloadelgg-4c84500ceeb484df84d116257e28b4924f2a7740.tar.gz
elgg-4c84500ceeb484df84d116257e28b4924f2a7740.tar.bz2
piped remaining profile pages through the canvas system
git-svn-id: https://code.elgg.org/elgg/trunk@902 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/profile/edit.php7
-rw-r--r--mod/profile/editicon.php4
2 files changed, 7 insertions, 4 deletions
diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index 046c9716f..9db4848dd 100644
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -22,14 +22,17 @@
// Get form, if we're allowed to edit
if ($user->canEdit()) {
- $body = elgg_view("profile/edit",array('entity' => $user));
+ $area1 = elgg_view("profile/edit",array('entity' => $user));
} else {
- $body = elgg_echo("profile:noaccess");
+ $area1 = elgg_echo("profile:noaccess");
}
+ // get the required canvas area
+ $body = elgg_view_layout("one_column", $area1);
+
// Draw the page
page_draw(elgg_echo("profile:edit"),$body);
diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php
index 2b33abb62..145932795 100644
--- a/mod/profile/editicon.php
+++ b/mod/profile/editicon.php
@@ -16,8 +16,8 @@
// Make sure we're logged in
if (!isloggedin()) forward();
- // Get the form
- $body = elgg_view("profile/editicon");
+ // Get the form and correct canvas area
+ $body = elgg_view_layout("one_column", elgg_view("profile/editicon"));
// Draw the page
page_draw(elgg_echo("profile:editicon"),$body);