From 64b8c599a2039baed8026815fdf5aacd487ef68a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 19 Feb 2019 13:07:29 +0200 Subject: [PATCH] Merge bug fixes --- app/Listeners/HandleUserSettingsChanged.php | 2 +- app/Ninja/Transformers/UserAccountTransformer.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Listeners/HandleUserSettingsChanged.php b/app/Listeners/HandleUserSettingsChanged.php index c70275713d8f..5a0dfb5b629c 100644 --- a/app/Listeners/HandleUserSettingsChanged.php +++ b/app/Listeners/HandleUserSettingsChanged.php @@ -44,7 +44,7 @@ class HandleUserSettingsChanged $users = $this->accountRepo->loadAccounts(Auth::user()->id); Session::put(SESSION_USER_ACCOUNTS, $users); - if ($event->user && $event->user->confirmed && $event->user->isEmailBeingChanged()) { + if ($event->user && $event->user->isEmailBeingChanged()) { $this->userMailer->sendConfirmation($event->user); $this->userMailer->sendEmailChanged($event->user); diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php index b8594ebc2b6d..a4d3e825a25e 100644 --- a/app/Ninja/Transformers/UserAccountTransformer.php +++ b/app/Ninja/Transformers/UserAccountTransformer.php @@ -217,13 +217,10 @@ class UserAccountTransformer extends EntityTransformer 'email_template_reminder1' => $account->getEmailTemplate('reminder1'), 'email_template_reminder2' => $account->getEmailTemplate('reminder2'), 'email_template_reminder3' => $account->getEmailTemplate('reminder3'), -<<<<<<< HEAD - -======= 'has_custom_design1' => (bool) $account->custom_design1, 'has_custom_design2' => (bool) $account->custom_design2, 'has_custom_design3' => (bool) $account->custom_design3, ->>>>>>> cd8b764... Fixes for mobile app + 'enable_portal_password' => (bool) $account->enable_portal_password, ]; } }