tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 14:39:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.5' into 4

Browse Source
This commit is contained in:
Robbie Averill 2020-01-16 20:00:02 -08:00
commit 4121099484
4 changed files with 8 additions and 13 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;
}
/**

8
src/Dev/Install/DatabaseAdapterRegistry.php
View File

@ -145,12 +145,8 @@ class DatabaseAdapterRegistry
$databaseConfig = $config;
}
// Search through all composer packages in vendor, updating $databaseConfig
foreach (glob(BASE_PATH . '/vendor/*', GLOB_ONLYDIR) as $vendor) {
foreach (glob($vendor . '/*', GLOB_ONLYDIR) as $directory) {
if (file_exists($directory . '/_configure_database.php')) {
include_once($directory . '/_configure_database.php');
}
}
foreach (glob(BASE_PATH . '/vendor/*/*/_configure_database.php') as $configFile) {
include_once $configFile;
}
// Update modified variable
$config = $databaseConfig;

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);
}
/**

4
src/i18n/TextCollection/i18nTextCollector.php
View File

@ -378,8 +378,8 @@ class i18nTextCollector
// Merge
if ($existingMessages) {
$entitiesByModule[$module] = array_merge(
$existingMessages,
$messages
$messages,
$existingMessages
);
}
}