diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-12-24 17:33:11 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-12-24 17:33:11 +0100 |
| commit | eded4937966340130834308a298123f9c7fa7508 (patch) | |
| tree | f2c28cf4fcb8eb90a1070e3a3a42cfb287fa91ca | |
| parent | 02ac8d563db25aea8f7ec983b67061129536d457 (diff) | |
| parent | f25e2ba41217632121f5226751b5430f487fcdf9 (diff) | |
Merge pull request #1398 from Alkarex/MultipleCookiesBug
Send cookie FreshRSS_login only once
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/Models/Auth.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fa883a7fa..d13912ae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * Fix small bugs in installer [#1363](https://github.com/FreshRSS/FreshRSS/pull/1363) * Allow slash in database hostname, when using sockets [#1364](https://github.com/FreshRSS/FreshRSS/issues/1364) * Add curl user-agent to retrieve favicons [#1380](https://github.com/FreshRSS/FreshRSS/issues/1380) + * Send login cookie only once [#1398](https://github.com/FreshRSS/FreshRSS/pull/1398) * Add a check for PHP extension fileinfo [#1375](https://github.com/FreshRSS/FreshRSS/issues/1375) diff --git a/app/Models/Auth.php b/app/Models/Auth.php index 042210eaf..b3255cfbd 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -238,8 +238,8 @@ class FreshRSS_FormAuth { public static function deleteCookie() { $token = Minz_Session::getLongTermCookie('FreshRSS_login'); - Minz_Session::deleteLongTermCookie('FreshRSS_login'); if (ctype_alnum($token)) { + Minz_Session::deleteLongTermCookie('FreshRSS_login'); @unlink(DATA_PATH . '/tokens/' . $token . '.txt'); } |