Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@8f1adbf

Original file line numberDiff line numberDiff line change

@@ -1038,7 +1038,7 @@ public function postConnect(Server $currentServer): void

10381038

/* Locale for messages */

10391039

$locale = LanguageManager::getInstance()->getCurrentLanguage()->getMySQLLocale();

10401040

if ($locale !== '') {

1041-

$this->query("SET lc_messages = '" . $locale . "';");

1041+

$this->tryQuery("SET lc_messages = '" . $locale . "';");

10421042

}

10431043
10441044

// Set timezone for the session, if required.