diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-28 14:02:08 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-28 14:02:08 +0100 |
commit | d3f6d525253eb7bb041d9436cbf213c10524a85c (patch) | |
tree | 014c3658074c29a97b0d5a990d379adbaab8d754 | |
parent | 156061d445fd23d033a52f84954484a3349c988a (diff) | |
download | Shaarli-d3f6d525253eb7bb041d9436cbf213c10524a85c.tar.gz Shaarli-d3f6d525253eb7bb041d9436cbf213c10524a85c.tar.zst Shaarli-d3f6d525253eb7bb041d9436cbf213c10524a85c.zip |
Fix compatiliby issue on login with PHP 7.1
session_set_cookie_params does not return any value in PHP 7.1
-rw-r--r-- | application/render/PageBuilder.php | 2 | ||||
-rw-r--r-- | application/security/SessionManager.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php index 25e0e284..c2fae705 100644 --- a/application/render/PageBuilder.php +++ b/application/render/PageBuilder.php | |||
@@ -160,7 +160,7 @@ class PageBuilder | |||
160 | 160 | ||
161 | $this->tpl->assign('formatter', $this->conf->get('formatter', 'default')); | 161 | $this->tpl->assign('formatter', $this->conf->get('formatter', 'default')); |
162 | 162 | ||
163 | $this->tpl->assign('links_per_page', $this->session['LINKS_PER_PAGE']); | 163 | $this->tpl->assign('links_per_page', $this->session['LINKS_PER_PAGE'] ?? 20); |
164 | 164 | ||
165 | // To be removed with a proper theme configuration. | 165 | // To be removed with a proper theme configuration. |
166 | $this->tpl->assign('conf', $this->conf); | 166 | $this->tpl->assign('conf', $this->conf); |
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 |