diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-08-14 09:22:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-14 09:22:24 +0200 |
commit | b13aa660c91873437afec36ef6466ef609b7959c (patch) | |
tree | 4e781caa229e4a17b612df563eaab395c148e2fe | |
parent | bc19168719dd4bbc2e0894905d15ccdd5a70001e (diff) | |
parent | 8daaf33e3d625a313c1560f07061bd3970dfd087 (diff) | |
download | nextcloud-server-b13aa660c91873437afec36ef6466ef609b7959c.tar.gz nextcloud-server-b13aa660c91873437afec36ef6466ef609b7959c.zip |
Merge pull request #22243 from nextcloud/fix/20490/no_session_duplicate_warnings
Silence duplicate session warnings
-rw-r--r-- | lib/private/Session/Internal.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Session/Internal.php b/lib/private/Session/Internal.php index ffe16537874..f08f4da52a7 100644 --- a/lib/private/Session/Internal.php +++ b/lib/private/Session/Internal.php @@ -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); } } } |