From 64d7655c6e15abbb94f1ac97e636d2e5cbaffe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 5 Feb 2013 12:20:46 +0100 Subject: [PATCH] [-] BO: Not allow to give an existing email when editing an employee --- controllers/admin/AdminEmployeesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index 667ce6213..4ed6e5490 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -343,7 +343,7 @@ class AdminEmployeesControllerCore extends AdminController $email = $this->getFieldValue($obj, 'email'); if (!Validate::isEmail($email)) $this->errors[] = Tools::displayError('Invalid e-mail'); - else if (Employee::employeeExists($email) && !Tools::getValue('id_employee')) + elseif (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 e-mail address:').' '.$email; }