upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 02:31:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

replace setcookie value with '' instead of null.

Browse source 
The php documentation states that an empty string should be used for a cookie when it has no real value.
null leads to the following error: expects parameter 2 to be string, null given

Signed-off-by: Martin Böh <mart.b@outlook.de>
This commit is contained in:
MartB 2018-09-06 20:34:16 +02:00 committed by Arthur Schiwon
parent fb9379db3e
commit fbc1f5cd38
No known key found for this signature in database
GPG key ID: 7424F1874854DF23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/base.php
View file

@ -441,7 +441,7 @@ class OC {
// session timeout
if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), null, -1, self::$WEBROOT ? : '/');
setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
}
\OC::$server->getUserSession()->logout();
}

2
lib/private/Session/Internal.php
View file

@ -54,7 +54,7 @@ class Internal extends Session {
try {
$this->invoke('session_start');
} catch (\Exception $e) {
setcookie($this->invoke('session_name'), null, -1, \OC::$WEBROOT ?: '/');
setcookie($this->invoke('session_name'), '', -1, \OC::$WEBROOT ?: '/');
}
restore_error_handler();
if (!isset($_SESSION)) {