diff --git a/ChangeLog b/ChangeLog
index 59739cf4c..632b15a84 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-03-12 Garvin Hicking <me@supergarv.de>
+    * New $sql_structure variable for the new table export design broke
+      DB export functionality. Fixed this.
+
 2003-03-12 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/ukrainian: update, thanks to Markijan Baran
 
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index 3e06a9f3f..1774d9190 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -202,6 +202,7 @@ else {
             $tmp_select = implode($table_select, '|');
             $tmp_select = '|' . $tmp_select . '|';
         }
+        
         while ($i < $num_tables) {
             if (!isset($single)) {
                 $table = PMA_mysql_tablename($tables, $i);
@@ -213,18 +214,19 @@ else {
                                       ? PMA_backquote($table)
                                       : '\'' . $table . '\'';
                 // If only datas, no need to displays table name
-                if (isset($sql_structure) && $sql_structure == 'structure') {
+                if ((isset($sql_structure) && $sql_structure == 'structure') || ($what != 'sql' && $what != 'dataonly')) {
                     $dump_buffer .= '# --------------------------------------------------------' . $crlf
                                  .  $crlf . '#' . $crlf
                                  .  '# ' . $strTableStructure . ' ' . $formatted_table_name . $crlf
                                  .  '#' . $crlf . $crlf
                                  .  PMA_getTableDef($db, $table, $crlf, $err_url, $use_comments_work) . ';' . $crlf;
                 }
+                
                 if (function_exists('PMA_kanji_str_conv')) { // Y.Kawada
                     $dump_buffer = PMA_kanji_str_conv($dump_buffer, $knjenc, isset($xkana) ? $xkana : '');
                 }
                 // At least data
-                if (isset($sql_data) && $sql_data == 'data') {
+                if ((isset($sql_data) && $sql_data == 'data') || (!isset($sql_data) && ($what == 'data' || $what == 'dataonly'))) {
                     $tcmt = $crlf . '#' . $crlf
                                  .  '# ' . $strDumpingData . ' ' . $formatted_table_name . $crlf
                                  .  '#' . $crlf .$crlf;