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

Merge branch 'master' into issue_46

Browse Source
This commit is contained in:
Antonio Ramirez
2017-08-09 15:37:20 +02:00
committed by GitHub
parent e372fd2f47 050600db39
commit 23f9fe028a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## 1.0.13 - Work in progress ## 1.0.13 - Work in progress
- Enh #46: Use safeUp()/safeDown() instead up()/down() in migrations (MKiselev) - Enh #46: Use safeUp()/safeDown() instead up()/down() in migrations (MKiselev)
- Fix #51: Typo fix rememberLoginLifeSpan to rememberLoginLifespan (MKiselev)
## 1.0.12 - August 6, 2017 ## 1.0.12 - August 6, 2017
- Bug Fix: Modify ResetPasswordService to forcely update password_hash field (tonydspaniard) - Bug Fix: Modify ResetPasswordService to forcely update password_hash field (tonydspaniard)

2
src/User/Service/SocialNetworkAuthenticateService.php
View File

@ -74,7 +74,7 @@ class SocialNetworkAuthenticateService implements ServiceInterface
Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your account has been blocked.')); Yii::$app->session->setFlash('danger', Yii::t('usuario', 'Your account has been blocked.'));
$this->authAction->setSuccessUrl(Url::to(['/user/security/login'])); $this->authAction->setSuccessUrl(Url::to(['/user/security/login']));
} else { } else {
Yii::$app->user->login($account->user, $this->controller->module->rememberLoginLifeSpan); Yii::$app->user->login($account->user, $this->controller->module->rememberLoginLifespan);
$this->authAction->setSuccessUrl(Yii::$app->getUser()->getReturnUrl()); $this->authAction->setSuccessUrl(Yii::$app->getUser()->getReturnUrl());
} }
} else { } else {