aboutsummaryrefslogtreecommitdiff
path: root/actions/user/password.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
commitccb6d625239b59b283b4d3fc00da704ab743d74c (patch)
treeda9b11d8758b3007c025e4d5487410ae1ca69f68 /actions/user/password.php
parent1368785a6b6f9c946dcc5eca078540bacce71f60 (diff)
downloadelgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.gz
elgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.bz2
Refs #2543: Updated trunk mods and views to use the new functions from previous 2 commits.
git-svn-id: http://code.elgg.org/elgg/trunk@8079 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/user/password.php')
-rw-r--r--actions/user/password.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/user/password.php b/actions/user/password.php
index bbeb0ea7f..8619372e4 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -12,14 +12,14 @@ $password2 = get_input('password2');
$user_id = get_input('guid');
if (!$user_id) {
- $user = get_loggedin_user();
+ $user = elgg_get_logged_in_user_entity();
} else {
$user = get_entity($user_id);
}
if (($user) && ($password != "")) {
// let admin user change anyone's password without knowing it except his own.
- if (!isadminloggedin() || isadminloggedin() && $user->guid == get_loggedin_userid()) {
+ if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
$credentials = array(
'username' => $user->username,
'password' => $current_password