From 72ec1b613c0c67e8096c06331ee0b56c1cb52648 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 15 Aug 2012 19:21:36 +0200 Subject: [PATCH] Could fix bug when editing a profile: empty emails see BT#4799 --- main/auth/profile.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/auth/profile.php b/main/auth/profile.php index e47a606210..82cdd13ca8 100644 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -595,8 +595,10 @@ if ($form->validate()) { //normal behaviour 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)) { - $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)."',"; + } $password = api_get_encrypted_password($password); $sql .= " password = '".Database::escape_string($password)."'"; } elseif (isset($password) && in_array('password', $available_values_to_modify)) { @@ -607,8 +609,6 @@ if ($form->validate()) { $sql = rtrim($sql, ','); } } - - $sql .= " WHERE user_id = '".api_get_user_id()."'"; Database::query($sql);