From 01831d37207d148b1dce42fdf98d3428cd2cae49 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 May 2005 16:34:09 +0000 Subject: [PATCH] bug #1186983, missing character sets and collations --- ChangeLog | 4 ++++ libraries/mysql_charsets.lib.php | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 22670070f..17a3656af 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-05-05 Marc Delisle + * libraries/mysql_charsets.lib.php: bug #1186983, missing character + sets and collations (temporary workaround) + 2005-05-04 Marc Delisle * Documentation.html: improvement about PmaAbsoluteUri, thanks to Isaac Bennetch - ibennetch diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index b58bcce15..498ac8aab 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -32,7 +32,8 @@ if (PMA_MYSQL_INT_VERSION >= 40100){ if ((isset($row['D']) && $row['D'] == 'Y') || (isset($row['Default']) && $row['Default'] == 'Yes')) { $mysql_default_collations[$row['Charset']] = $row['Collation']; } - $mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes'; + //$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes'; + $mysql_collations_available[$row['Collation']] = TRUE; $mysql_charsets_available[$row['Charset']] = !empty($mysql_charsets_available[$row['Charset']]) || !empty($mysql_collations_available[$row['Collation']]); }