add scrutinizer suggestion

This commit is contained in:
Antonio Ramirez
2017-06-13 16:03:14 +02:00
parent e9fcde48fb
commit 95ebe6d799

View File

@ -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;