From fbbbebf6e255f1b51c28368ee20d23ef3c6071fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 26 Mar 2023 23:14:41 -0300
Subject: [PATCH] Fix wrong global var name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduced by 437215cab2b21fa8a7b178b776b34c85a8f594bc

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Config.php | 2 +-
 psalm-baseline.xml           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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 @@
       <code><![CDATA[$GLOBALS['cfg']['Server']['controlport']]]></code>
       <code><![CDATA[$GLOBALS['cfg']['Server']['controluser']]]></code>
       <code><![CDATA[$GLOBALS['cfg']['Server']['hide_connection_errors']]]></code>
-      <code><![CDATA[$GLOBALS['collationConnection']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
       <code>$collationConnection</code>