From 95ebe6d799e6e5cea58dff65e184d3244f2399d1 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Tue, 13 Jun 2017 16:03:14 +0200 Subject: [PATCH] add scrutinizer suggestion --- src/User/Form/SettingsForm.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/User/Form/SettingsForm.php b/src/User/Form/SettingsForm.php index 1df41df..3236415 100644 --- a/src/User/Form/SettingsForm.php +++ b/src/User/Form/SettingsForm.php @@ -122,21 +122,23 @@ class SettingsForm extends Model { if ($this->validate()) { $user = $this->getUser(); - $user->scenario = 'settings'; - $user->username = $this->username; - $user->password = $this->new_password; - if ($this->email == $user->email && $user->unconfirmed_email != null) { - $user->unconfirmed_email = null; - } elseif ($this->email != $user->email) { - $strategy = EmailChangeStrategyFactory::makeByStrategyType( - $this->getModule()->emailChangeStrategy, - $this - ); + if ($user instanceof User) { + $user->scenario = 'settings'; + $user->username = $this->username; + $user->password = $this->new_password; + if ($this->email == $user->email && $user->unconfirmed_email != null) { + $user->unconfirmed_email = null; + } elseif ($this->email != $user->email) { + $strategy = EmailChangeStrategyFactory::makeByStrategyType( + $this->getModule()->emailChangeStrategy, + $this + ); - return $strategy->run(); + return $strategy->run(); + } + + return $user->save(); } - - return $user->save(); } return false;