From 0067ac6ca6389b61917cd7a19e7772e68ea78e8a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 30 Jan 2013 00:16:37 +0100 Subject: [PATCH 1/2] Remove the no longer existing function "isUserVerified" Thx @eMerzh --- settings/ajax/changepassword.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 8d45e62e4d..f6fa38fd9b 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -15,14 +15,8 @@ if(OC_User::isAdminUser(OC_User::getUser())) { if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { $userstatus = 'subadmin'; } -if(OC_User::getUser() === $username) { - if (OC_User::checkPassword($username, $oldPassword)) { +if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { $userstatus = 'user'; - } else { - if (!OC_Util::isUserVerified()) { - $userstatus = null; - } - } } if(is_null($userstatus)) { From a7aff48658d66f9bd0df891be6bbbf9e11b2d20a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 30 Jan 2013 00:17:41 +0100 Subject: [PATCH 2/2] Fix indentation --- settings/ajax/changepassword.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index f6fa38fd9b..c1ff0a6370 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -16,7 +16,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { $userstatus = 'subadmin'; } if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { - $userstatus = 'user'; + $userstatus = 'user'; } if(is_null($userstatus)) {