Should fix bug when changing the email in the user's profile see #5556

main/auth/profile.php

@@ -577,7 +577,7 @@ if ($form->validate()) {
 
     //change email
     if ($allow_users_to_change_email_with_no_password) {        
-        if (!empty($changeemail) && in_array('email', $available_values_to_modify)) {
+        if (in_array('email', $available_values_to_modify)) {
             $sql .= " email = '".Database::escape_string($changeemail)."',";
         }
         if (isset($password) && in_array('password', $available_values_to_modify)) {
@@ -592,9 +592,7 @@ if ($form->validate()) {
         if (!empty($changeemail) && !isset($password) && in_array('email', $available_values_to_modify)) {
             $sql .= " email = '".Database::escape_string($changeemail)."'";
         } elseif (isset($password) && isset($changeemail) && in_array('email', $available_values_to_modify) && in_array('password', $available_values_to_modify)) {            
-            if (!empty($changeemail)) {
-                $sql .= " email = '".Database::escape_string($changeemail)."',";
-            }
+            $sql .= " email = '".Database::escape_string($changeemail)."',";
             $password = api_get_encrypted_password($password);
             $sql .= " password = '".Database::escape_string($password)."'";
         } elseif (isset($password) && in_array('password', $available_values_to_modify)) {
@@ -744,4 +742,4 @@ if (api_get_setting('allow_social_tool') == 'true') {
     echo '</div>';
     $form->display();
 }
-Display :: display_footer();
+Display :: display_footer();