diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-28 14:08:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-28 14:08:08 +0100 |
commit | 1ca7ddd76bc5736b69e878ef1c6b96b77b084366 (patch) | |
tree | 0f360275941bd5c7b55f820d92451d22cde8eb0b /application/security | |
parent | d2bb40cc7ca2a7f9c2403087016a0050a7113e07 (diff) | |
parent | d3f6d525253eb7bb041d9436cbf213c10524a85c (diff) | |
download | Shaarli-1ca7ddd76bc5736b69e878ef1c6b96b77b084366.tar.gz Shaarli-1ca7ddd76bc5736b69e878ef1c6b96b77b084366.tar.zst Shaarli-1ca7ddd76bc5736b69e878ef1c6b96b77b084366.zip |
Merge pull request #1614 from ArthurHoaro/hotfix/php71-compat-login
Fix compatiliby issue on login with PHP 7.1
Diffstat (limited to 'application/security')
-rw-r--r-- | application/security/SessionManager.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/application/security/SessionManager.php b/application/security/SessionManager.php index 36df8c1c..96bf193c 100644 --- a/application/security/SessionManager.php +++ b/application/security/SessionManager.php | |||
@@ -293,9 +293,12 @@ class SessionManager | |||
293 | return session_start(); | 293 | return session_start(); |
294 | } | 294 | } |
295 | 295 | ||
296 | public function cookieParameters(int $lifeTime, string $path, string $domain): bool | 296 | /** |
297 | * Be careful, return type of session_set_cookie_params() changed between PHP 7.1 and 7.2. | ||
298 | */ | ||
299 | public function cookieParameters(int $lifeTime, string $path, string $domain): void | ||
297 | { | 300 | { |
298 | return session_set_cookie_params($lifeTime, $path, $domain); | 301 | session_set_cookie_params($lifeTime, $path, $domain); |
299 | } | 302 | } |
300 | 303 | ||
301 | public function regenerateId(bool $deleteOldSession = false): bool | 304 | public function regenerateId(bool $deleteOldSession = false): bool |