nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1186983, missing character sets and collations

Browse Source
This commit is contained in:
Marc Delisle
2005-05-05 16:34:09 +00:00
parent 85e975149d
commit 01831d3720
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-05-05 Marc Delisle <lem9@users.sourceforge.net>
* libraries/mysql_charsets.lib.php: bug #1186983, missing character
sets and collations (temporary workaround)
2005-05-04 Marc Delisle <lem9@users.sourceforge.net> 2005-05-04 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: improvement about PmaAbsoluteUri, * Documentation.html: improvement about PmaAbsoluteUri,
thanks to Isaac Bennetch - ibennetch thanks to Isaac Bennetch - ibennetch

3
libraries/mysql_charsets.lib.php
View File

@@ -32,7 +32,8 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
if ((isset($row['D']) && $row['D'] == 'Y') || (isset($row['Default']) && $row['Default'] == 'Yes')) { if ((isset($row['D']) && $row['D'] == 'Y') || (isset($row['Default']) && $row['Default'] == 'Yes')) {
$mysql_default_collations[$row['Charset']] = $row['Collation']; $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']]); $mysql_charsets_available[$row['Charset']] = !empty($mysql_charsets_available[$row['Charset']]) || !empty($mysql_collations_available[$row['Collation']]);
} }