mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22247 from nextcloud/backport/22243/stable19 

[stable19] Silence duplicate session warnings
This commit is contained in:
Morris Jobke 2020-08-14 10:00:33 +02:00 committed by GitHub
parent 10ee9791ff a6760c2b1c
commit 7fffe82c57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Session/Internal.php
View File

@ -104,7 +104,7 @@ class Internal extends Session {
public function clear() {
$this->invoke('session_unset');
$this->regenerateId();
$this->startSession();
$this->startSession(true);
$_SESSION = [];
}
@ -213,11 +213,11 @@ class Internal extends Session {
}
}
private function startSession() {
private function startSession(bool $silence = false) {
if (PHP_VERSION_ID < 70300) {
$this->invoke('session_start');
$this->invoke('session_start', [], $silence);
} else {
$this->invoke('session_start', [['cookie_samesite' => 'Lax']]);
$this->invoke('session_start', [['cookie_samesite' => 'Lax']], $silence);
}
}
}