tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

Browse Source
This commit is contained in:
Robbie Averill 2020-01-16 19:59:24 -08:00
commit 26e3b6f4e3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Control/Session.php
View File

@ -225,9 +225,7 @@ class Session
if (isset($this->data['HTTP_USER_AGENT'])) { if (isset($this->data['HTTP_USER_AGENT'])) {
if ($this->data['HTTP_USER_AGENT'] !== $this->userAgent($request)) { if ($this->data['HTTP_USER_AGENT'] !== $this->userAgent($request)) {
$this->clearAll(); $this->clearAll();
$this->destroy(); $this->restart($request);
$this->started = false;
$this->start($request);
} }
} }
} }
@ -240,7 +238,7 @@ class Session
public function restart(HTTPRequest $request) public function restart(HTTPRequest $request)
{ {
$this->destroy(); $this->destroy();
$this->init($request); $this->start($request);
} }
/** /**
@ -368,6 +366,7 @@ class Session
// http://nz1.php.net/manual/en/function.session-destroy.php // http://nz1.php.net/manual/en/function.session-destroy.php
unset($_SESSION); unset($_SESSION);
$this->data = null; $this->data = null;
$this->started = false;
} }
/** /**