diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-20 18:08:05 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-20 18:08:05 +0000 |
| commit | 735bb024f58cf28181fcb9baa62e4063b0f7171b (patch) | |
| tree | f6e04d32e2453befbacaf8d75e636bb92507c27d | |
| parent | b9a46dc335546fbf62ae4e05d1f69ec2fd7b07c3 (diff) | |
| download | elgg-735bb024f58cf28181fcb9baa62e4063b0f7171b.tar.gz elgg-735bb024f58cf28181fcb9baa62e4063b0f7171b.tar.bz2 | |
Fixed profile, and allowed admins to edit other profiles
git-svn-id: https://code.elgg.org/elgg/trunk@1036 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/profile/actions/edit.php | 8 | ||||
| -rw-r--r-- | mod/profile/edit.php | 5 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/edit.php | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php index 7ace0a22b..7a74535cd 100644 --- a/mod/profile/actions/edit.php +++ b/mod/profile/actions/edit.php @@ -22,7 +22,13 @@ }
// Save stuff if we can, and forward to the user's profile
- $user = $_SESSION['user'];
+
+ if ($user = page_owner()) {
+ $user = page_owner_entity();
+ } else {
+ $user = $_SESSION['user'];
+ set_page_owner($user->getGUID());
+ }
if ($user->canEdit()) {
// Save stuff
diff --git a/mod/profile/edit.php b/mod/profile/edit.php index 50f4b0955..a1afc26cc 100644 --- a/mod/profile/edit.php +++ b/mod/profile/edit.php @@ -17,8 +17,11 @@ if (!isloggedin()) forward();
// Get current user for now
- if (!$user = page_owner_entity()) {
+ if ($user = page_owner()) {
+ $user = page_owner_entity();
+ } else {
$user = $_SESSION['user'];
+ set_page_owner($user->getGUID());
}
// Get form, if we're allowed to edit
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php index 5945e4d76..8822988d6 100644 --- a/mod/profile/views/default/profile/edit.php +++ b/mod/profile/views/default/profile/edit.php @@ -42,6 +42,7 @@ ?>
<p>
+ <input type="hidden" name="username" value="<?php echo page_owner_entity()->username; ?>" />
<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
</p>
|