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

Merge branch '4.11' into 4

Browse Source
This commit is contained in:
Steve Boyd 2022-07-04 13:20:12 +12:00
commit b101b8bdb8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ORM/Connect/PDOConnector.php
View File

@ -292,7 +292,7 @@ class PDOConnector extends DBConnector implements TransactionManager
public function quoteString($value) public function quoteString($value)
{ {
return $this->pdoConnection->quote($value); return $this->pdoConnection->quote($value ?? '');
} }
/** /**

2
src/Security/Security.php
View File

@ -948,7 +948,7 @@ class Security extends Controller implements TemplateGlobalProvider
static::clearSessionMessage(); static::clearSessionMessage();
// Ensure title is present - in case getResponseController() didn't return a page controller // Ensure title is present - in case getResponseController() didn't return a page controller
$fragments = array_merge($fragments, ['Title' => $title]); $fragments = array_merge(['Title' => $title], $fragments);
if ($message) { if ($message) {
$messageResult = [ $messageResult = [
'Content' => DBField::create_field('HTMLFragment', $message), 'Content' => DBField::create_field('HTMLFragment', $message),