diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 5e83fec7e4..88f6baf5d1 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -417,7 +417,7 @@ class Config private function setConnectionCollation(): void { $collationConnection = $this->get('DefaultConnectionCollation'); - if (empty($collationConnection) || $collationConnection == $GLOBALS['collationConnection']) { + if (empty($collationConnection) || $collationConnection == $GLOBALS['collation_connection']) { return; } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 21f2abaf77..26ebe23071 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -263,7 +263,6 @@ - $collationConnection