tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.4' into 4.5

This commit is contained in:
Robbie Averill 2020-01-16 19:59:42 -08:00
parent 38d7bd700d 26e3b6f4e3
commit 53fcd47dfc
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Control/Session.php
View File

@ -233,9 +233,7 @@ class Session
if (self::config()->get('strict_user_agent_check') && isset($this->data['HTTP_USER_AGENT'])) {
if ($this->data['HTTP_USER_AGENT'] !== $this->userAgent($request)) {
$this->clearAll();
$this->destroy();
$this->started = false;
$this->start($request);
$this->restart($request);
}
}
}
@ -248,7 +246,7 @@ class Session
public function restart(HTTPRequest $request)
{
$this->destroy();
$this->init($request);
$this->start($request);
}
/**
@ -376,6 +374,7 @@ class Session
// http://nz1.php.net/manual/en/function.session-destroy.php
unset($_SESSION);
$this->data = null;
$this->started = false;
}
/**

2
src/ORM/ArrayList.php
View File

@ -600,7 +600,7 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
$firstRecord = $this->first();
return array_key_exists($by, $firstRecord);
return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($by, $firstRecord);
}
/**