php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-06 14:19:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update PHPDoc, CHANGELOG, UPGRADE.md

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2016-05-22 12:54:20 +03:00
parent 7249a6c99e
commit 38be74446e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/web/User.php
View File

@ -549,12 +549,13 @@ class User extends Component
* This method attempts to authenticate a user using the information in the identity cookie.
* @return array|null Returns an array of 'identity' and 'duration' if valid, otherwise null.
* @see loginByCookie()
* @since 2.0.9
*/
protected function getIdentityAndDurationFromCookie()
{
$value = Yii::$app->getRequest()->getCookies()->getValue($this->identityCookie['name']);
if ($value === null) {
return;
return null;
}
$data = json_decode($value, true);
if (count($data) == 3) {
@ -573,12 +574,13 @@ class User extends Component
}
}
$this->removeIdentityCookie();
return;
return null;
}
/**
* Removes the identity cookie.
* This method is used when [[enableAutoLogin]] is true.
* @since 2.0.9
*/
protected function removeIdentityCookie()
{