Configurable default connection collation (RFE #1025969).

2005-11-23 13:22:26 +00:00
parent ccb2e11f67
commit dc94d054eb
4 changed files with 16 additions and 1 deletions
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -404,7 +404,9 @@ if (!is_dir($pmaThemeImage)) {
 if (isset($_COOKIE) && !empty($_COOKIE['pma_collation_connection']) && empty($_POST['collation_connection'])) {
    $collation_connection = $_COOKIE['pma_collation_connection'];
 }
-
+if (!isset($collation_connection)) {
+    $collation_connection = $GLOBALS['cfg']['DefaultConnectionCollation'];
+}

 if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
    /**