From 2cf884ac961409d00dc86f9dc00148a70a3e6233 Mon Sep 17 00:00:00 2001 From: borisaeric Date: Mon, 20 Aug 2018 17:36:45 +0200 Subject: [PATCH] fix unpassable condition in EmailChangeService --- CHANGELOG.md | 1 + src/User/Model/User.php | 2 +- src/User/Service/EmailChangeService.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ecee3a..5fe55b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ## 1.5.0 - Work in progress + - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) - Fix #198: Updated translations by quique, bizley, TonisOrmisson, guogan, Dezinger, maxxer, wautvda, mrbig00 - Fix #209: Doc fix. allowAccountDelete default value is false (Dezinger) - Fix #211: Migration boolean default value set to FALSE instead 0 (Dezinger) diff --git a/src/User/Model/User.php b/src/User/Model/User.php index 610772d..d333453 100644 --- a/src/User/Model/User.php +++ b/src/User/Model/User.php @@ -65,7 +65,7 @@ class User extends ActiveRecord implements IdentityInterface use ContainerAwareTrait; // following constants are used on secured email changing process - const OLD_EMAIL_CONFIRMED = 0b1; + const OLD_EMAIL_CONFIRMED = 0b01; const NEW_EMAIL_CONFIRMED = 0b10; /** diff --git a/src/User/Service/EmailChangeService.php b/src/User/Service/EmailChangeService.php index 3400846..3b6db9a 100644 --- a/src/User/Service/EmailChangeService.php +++ b/src/User/Service/EmailChangeService.php @@ -76,7 +76,7 @@ class EmailChangeService implements ServiceInterface ); } } - if (($this->model->flags & User::NEW_EMAIL_CONFIRMED & $this->model->flags & User::OLD_EMAIL_CONFIRMED) + if ((($this->model->flags & User::NEW_EMAIL_CONFIRMED) && ($this->model->flags & User::OLD_EMAIL_CONFIRMED)) || $this->getModule()->emailChangeStrategy === MailChangeStrategyInterface::TYPE_DEFAULT ) { $this->model->email = $this->model->unconfirmed_email;