From b37178e831190f315c643bf6c5de765336b7563a Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Fri, 1 Jul 2022 02:58:57 +0100 Subject: [PATCH 1/2] FIX: 'passwordsent' title was not being displayed (fixes #10366) (#10367) --- src/Security/Security.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Security.php b/src/Security/Security.php index d58c6d715..5f82d8202 100644 --- a/src/Security/Security.php +++ b/src/Security/Security.php @@ -948,7 +948,7 @@ class Security extends Controller implements TemplateGlobalProvider static::clearSessionMessage(); // 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) { $messageResult = [ 'Content' => DBField::create_field('HTMLFragment', $message), From ad83b78a10ac0d0cc3e1a464f50c02a8b38f41eb Mon Sep 17 00:00:00 2001 From: Brandon Iffert Date: Sun, 3 Jul 2022 21:17:51 -0400 Subject: [PATCH 2/2] FIX Handle null values passed to PDO::quote() (#10383) --- src/ORM/Connect/PDOConnector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ORM/Connect/PDOConnector.php b/src/ORM/Connect/PDOConnector.php index 7f4c5ff3e..bb1637d65 100644 --- a/src/ORM/Connect/PDOConnector.php +++ b/src/ORM/Connect/PDOConnector.php @@ -292,7 +292,7 @@ class PDOConnector extends DBConnector implements TransactionManager public function quoteString($value) { - return $this->pdoConnection->quote($value); + return $this->pdoConnection->quote($value ?? ''); } /**