[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-392-g186426c

[Michal Čihař]

The branch, master has been updated
       via  186426cbaf0262b49dfc4a67e4b1347296ef0219 (commit)
      from  724f11f20d7b05963fcf9c1a4e1a462fa6488c93 (commit)


- Log -----------------------------------------------------------------
commit 186426cbaf0262b49dfc4a67e4b1347296ef0219
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Mar 18 15:29:18 2011 +0100

    Ignore NULL charset

-----------------------------------------------------------------------

Summary of changes:
 libraries/import.lib.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 79a43b7..f0a431e 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -908,13 +908,13 @@ $import_notice = NULL;
  */
 function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) {
     /* Take care of the options */
-    if (isset($options['db_collation'])) {
+    if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) {
         $collation = $options['db_collation'];
     } else {
         $collation = "utf8_general_ci";
     }
     
-    if (isset($options['db_charset'])) {
+    if (isset($options['db_charset']) && ! is_null($options['db_charset'])) {
         $charset = $options['db_charset'];
     } else {
         $charset = "utf8";


hooks/post-receive
-- 
phpMyAdmin