diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-02-06 11:14:59 -0800 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-02-06 11:14:59 -0800 |
| commit | ad644b4e08ddee30dddbe9a2311f0de3d3c5fae4 (patch) | |
| tree | 9daeed6dafdbefff51bce1cb94be144229eb6016 /settings/ajax | |
| parent | a26f17c1303d0f4e08144d9ca508488f09cbba3b (diff) | |
| parent | a7aff48658d66f9bd0df891be6bbbf9e11b2d20a (diff) | |
| download | nextcloud-server-ad644b4e08ddee30dddbe9a2311f0de3d3c5fae4.tar.gz nextcloud-server-ad644b4e08ddee30dddbe9a2311f0de3d3c5fae4.zip | |
Merge pull request #1363 from owncloud/FixPasswordChange
Fix password change
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/changepassword.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 8d45e62e4d8..c1ff0a63701 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)) { - $userstatus = 'user'; - } else { - if (!OC_Util::isUserVerified()) { - $userstatus = null; - } - } +if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { + $userstatus = 'user'; } if(is_null($userstatus)) { |