Merge branch 'QA_4_1'

phpmyadmin · Feb 26, 2014 · 0aae267 · 0aae267
2 parents bb788aa + ff06483
commit 0aae267
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -30,6 +30,8 @@ phpMyAdmin - ChangeLog
 4.1.9.0 (not yet released)
 - bug #4279 CTRL + up or down moves two fields (part one)
 - bug #4294 output as text radio clickable for "OpenDocument Text" export 
+- bug #4297 DROP DATABASE tick box in export no longer works
+- bug #4291 Unable to export comments in OpenDocument text format
 
 4.1.8.0 (2014-02-22)
 - bug #4276 Login loop on session expiry

diff --git a/export.php b/export.php
@@ -123,6 +123,7 @@
             'sql_max_query_size',
             'sql_hex_for_blob',
             'sql_utc_time',
+            'sql_drop_database',
             'csv_separator',
             'csv_enclosed',
             'csv_escaped',
@@ -357,7 +358,8 @@
 
         // Will we need relation & co. setup?
         $do_relation = isset($GLOBALS[$what . '_relation']);
-        $do_comments = isset($GLOBALS[$what . '_include_comments']);
+        $do_comments = isset($GLOBALS[$what . '_include_comments'])
+            || isset($GLOBALS[$what . '_comments']) ;
         $do_mime     = isset($GLOBALS[$what . '_mime']);
         if ($do_relation || $do_comments || $do_mime) {
             $cfgRelation = PMA_getRelationsParam();

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -1918,13 +1918,6 @@
  */
 $cfg['Export']['sql_max_query_size'] = 50000;
 
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_comments']
- */
-$cfg['Export']['sql_comments'] = false;
-
 /**
  *
  *