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

Ignore NULL charset

Browse Source
This commit is contained in:
Michal Čihař
2011-03-18 15:29:18 +01:00
parent 724f11f20d
commit 186426cbaf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/import.lib.php
View File

@@ -908,13 +908,13 @@ $import_notice = NULL;
*/ */
function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) { function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) {
/* Take care of the options */ /* Take care of the options */
if (isset($options['db_collation'])) { if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) {
$collation = $options['db_collation']; $collation = $options['db_collation'];
} else { } else {
$collation = "utf8_general_ci"; $collation = "utf8_general_ci";
} }
if (isset($options['db_charset'])) { if (isset($options['db_charset']) && ! is_null($options['db_charset'])) {
$charset = $options['db_charset']; $charset = $options['db_charset'];
} else { } else {
$charset = "utf8"; $charset = "utf8";