From c83a2a5517bc320d418b31005efc6f37c9091b9a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 16 Oct 2012 00:28:20 +0200
Subject: [PATCH] Correct check for admin
---
settings/ajax/changepassword.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index d421181c3b..b797fcf918 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -19,12 +19,10 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$userstatus = 'subadmin';
}
if(OC_User::getUser() === $username) {
- if (OC_User::checkPassword($username, $oldPassword))
+ if (OC_User::checkPassword($username, $oldPassword) && ($userstatus === null || !OC_JSON::isUserVerified()))
{
$userstatus = 'user';
- } else {
- $userstatus = null;
- }
+ }
}
if(is_null($userstatus)) {
--
GitLab