From 252ab56d75d02333edfd4b9df931cc2a98aab3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 26 Sep 2013 13:47:42 +0200 Subject: [PATCH] // error message in double --- controllers/admin/AdminEmployeesController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 945a95ba0..ba0aefa34 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -341,9 +341,7 @@ class AdminEmployeesControllerCore extends AdminController if (!($obj = $this->loadObject(true))) return false; $email = $this->getFieldValue($obj, 'email'); - if (!Validate::isEmail($email)) - $this->errors[] = Tools::displayError('Invalid email address.'); - elseif (Employee::employeeExists($email) && (!Tools::getValue('id_employee') || ($employee = new Employee((int)Tools::getValue('id_employee'))) && $employee->email != $email)) + if (Validate::isEmail($email) && Employee::employeeExists($email) && (!Tools::getValue('id_employee') || ($employee = new Employee((int)Tools::getValue('id_employee'))) && $employee->email != $email)) $this->errors[] = Tools::displayError('An account already exists for this email address:').' '.$email; }