From b493acfee533189815ca1ccfb6f57f71a4770dfe Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Fri, 26 Feb 2016 15:20:09 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/user/entity/User.entity.class.php | 12 ++++++------ framework | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/classes/modules/user/entity/User.entity.class.php b/application/classes/modules/user/entity/User.entity.class.php index 18d0bad1..907a5a1e 100644 --- a/application/classes/modules/user/entity/User.entity.class.php +++ b/application/classes/modules/user/entity/User.entity.class.php @@ -110,10 +110,10 @@ class ModuleUser_EntityUser extends Entity */ public function ValidateLoginExists($sValue, $aParams) { - if (!$this->User_GetUserByLogin($sValue)) { - return true; + if ($oUserOld = $this->User_GetUserByLogin($sValue) and $oUserOld->getId() != $this->getId()) { + return $this->Lang_Get('auth.registration.notices.error_login_used'); } - return $this->Lang_Get('auth.registration.notices.error_login_used'); + return true; } /** @@ -125,10 +125,10 @@ class ModuleUser_EntityUser extends Entity */ public function ValidateMailExists($sValue, $aParams) { - if (!$this->User_GetUserByMail($sValue)) { - return true; + if ($oUserOld = $this->User_GetUserByMail($sValue) and $oUserOld->getId() != $this->getId()) { + return $this->Lang_Get('auth.registration.notices.error_mail_used'); } - return $this->Lang_Get('auth.registration.notices.error_mail_used'); + return true; } /** diff --git a/framework b/framework index 019a61c9..13717ef6 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 019a61c9735354cf3a710ce432405380f0583d9b +Subproject commit 13717ef65ec9d1d630427151a6981615db40b123