diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
| commit | 43c77f658a905e2def6aeca4c092683977cd0c55 (patch) | |
| tree | cb0dc273a315a777847d251f856625b2fc779c04 /application/security | |
| parent | 630ebca2b6359e942e5b6c057cca2b6069c1093a (diff) | |
| parent | 1826e383ecf501302974132fd443cf1ca06e10f6 (diff) | |
| download | Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.gz Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.zst Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.zip | |
Merge commit '1826e383ecf501302974132fd443cf1ca06e10f6' into v0.10
Diffstat (limited to 'application/security')
| -rw-r--r-- | application/security/LoginManager.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php index d6784d6d..0f315483 100644 --- a/application/security/LoginManager.php +++ b/application/security/LoginManager.php | |||
| @@ -95,7 +95,6 @@ class LoginManager | |||
| 95 | // The user client has a valid stay-signed-in cookie | 95 | // The user client has a valid stay-signed-in cookie |
| 96 | // Session information is updated with the current client information | 96 | // Session information is updated with the current client information |
| 97 | $this->sessionManager->storeLoginInfo($clientIpId); | 97 | $this->sessionManager->storeLoginInfo($clientIpId); |
| 98 | |||
| 99 | } elseif ($this->sessionManager->hasSessionExpired() | 98 | } elseif ($this->sessionManager->hasSessionExpired() |
| 100 | || $this->sessionManager->hasClientIpChanged($clientIpId) | 99 | || $this->sessionManager->hasClientIpChanged($clientIpId) |
| 101 | ) { | 100 | ) { |