Merge branch 'master' into issue_49

This commit is contained in:
Antonio Ramirez
2017-08-09 15:38:08 +02:00
committed by GitHub
7 changed files with 13 additions and 11 deletions

View File

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