Merged r6701:6756 from 1.7 branch into trunk

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

1 files changed, 1 insertions, 4 deletions

diff --git a/actions/user/password.php b/actions/user/password.php
index 6e3ff9447..25723c0b0 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -8,17 +8,14 @@
  * @link http://elgg.org/
  */
 
-global $CONFIG;
-
 gatekeeper();
 
 $password = get_input('password');
 $password2 = get_input('password2');
 $user_id = get_input('guid');
-$user = "";
 
 if (!$user_id) {
-	$user = $_SESSION['user'];
+	$user = get_loggedin_user();
 } else {
 	$user = get_entity($user_id);
 }