Fix user can't change email when enter password - Refs #7942

10 years ago · be05ad2530
parent 5eaf7e14c0
commit be05ad2530
1 changed files with 4 additions and 2 deletions
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@ -500,8 +500,10 @@ if ($form->validate()) {
    $validPassword = false;
    $passwordWasChecked = false;
    if ($user &&
-        !empty($user_data['password0']) &&
-        !empty($user_data['password1'])
+        (!empty($user_data['password0']) &&
+        !empty($user_data['password1'])) ||
+        (!empty($user_data['password0']) && 
+        api_get_setting('profile', 'email') == 'true')
    ) {
        $passwordWasChecked = true;
        $validPassword = UserManager::isPasswordValid(