mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.4' into 4.5
This commit is contained in:
commit
53fcd47dfc
@ -233,9 +233,7 @@ class Session
|
|||||||
if (self::config()->get('strict_user_agent_check') && isset($this->data['HTTP_USER_AGENT'])) {
|
if (self::config()->get('strict_user_agent_check') && 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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -248,7 +246,7 @@ class Session
|
|||||||
public function restart(HTTPRequest $request)
|
public function restart(HTTPRequest $request)
|
||||||
{
|
{
|
||||||
$this->destroy();
|
$this->destroy();
|
||||||
$this->init($request);
|
$this->start($request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -376,6 +374,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -600,7 +600,7 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
|
|||||||
|
|
||||||
$firstRecord = $this->first();
|
$firstRecord = $this->first();
|
||||||
|
|
||||||
return array_key_exists($by, $firstRecord);
|
return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($by, $firstRecord);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user