leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add scrutinizer suggestion

Browse Source
This commit is contained in:
Antonio Ramirez
2017-06-13 16:03:14 +02:00
parent e9fcde48fb
commit 95ebe6d799
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/User/Form/SettingsForm.php
View File

@ -122,21 +122,23 @@ class SettingsForm extends Model
{ {
if ($this->validate()) { if ($this->validate()) {
$user = $this->getUser(); $user = $this->getUser();
$user->scenario = 'settings'; if ($user instanceof User) {
$user->username = $this->username; $user->scenario = 'settings';
$user->password = $this->new_password; $user->username = $this->username;
if ($this->email == $user->email && $user->unconfirmed_email != null) { $user->password = $this->new_password;
$user->unconfirmed_email = null; if ($this->email == $user->email && $user->unconfirmed_email != null) {
} elseif ($this->email != $user->email) { $user->unconfirmed_email = null;
$strategy = EmailChangeStrategyFactory::makeByStrategyType( } elseif ($this->email != $user->email) {
$this->getModule()->emailChangeStrategy, $strategy = EmailChangeStrategyFactory::makeByStrategyType(
$this $this->getModule()->emailChangeStrategy,
); $this
);
return $strategy->run(); return $strategy->run();
}
return $user->save();
} }
return $user->save();
} }
return false; return false;