diff --git a/ChangeLog b/ChangeLog
index 1fa3fcdfb..7a2f6237a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-05-13 Michal Cihar  <nijel@users.sourceforge.net>
+    * libraries/display_export.lib.php3, tbl_dump.php3: Support for exporting
+      CSV for multiple tables, it just puts all content into one file, but
+      some people seem to want this (based on patch #735136).
+
 2003-05-14 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/defines_php.lib.php3: bug 736111: better GD2 detection
 
diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3
index bcb82d0cd..9ce1324c5 100644
--- a/libraries/display_export.lib.php3
+++ b/libraries/display_export.lib.php3
@@ -39,9 +39,7 @@ if (isset($sql_query)) {
     /* Write h to e   */    function wH(e,h){if(l){Y=e.document;Y.write(h);Y.close();}if(e.innerHTML)e.innerHTML=h;}
     
     function hide_them_all() {
-<?php if ($export_single) { ?>
         gE("csv_options").style.display = 'none';
-<?php } ?>
         gE("latex_options").style.display = 'none';
         gE("sql_options").style.display = 'none';
         gE("none_options").style.display = 'none';
@@ -73,10 +71,6 @@ if (isset($sql_query)) {
             <label for="radio_dump_latex"><?php echo $strLaTeX; ?></label>
             <br /><br />
 
-<?php                    
-/* CSV export just for single table */
-if ($export_single) {
-?>
             <!-- Excel CSV -->
             <input type="radio" name="what" value="excel" id="radio_dump_excel"  onclick="if(this.checked) { hide_them_all(); gE('none_options').style.display = 'block'; }; return true" />
             <label for="radio_dump_excel"><?php echo $strStrucExcelCSV; ?></label>
@@ -85,9 +79,7 @@ if ($export_single) {
             <input type="radio" name="what" value="csv" id="radio_dump_csv"  onclick="if(this.checked) { hide_them_all(); gE('csv_options').style.display = 'block'; }; return true" />
             <label for="radio_dump_csv"><?php echo $strStrucCSV;?></label>
             <br /><br />
-<?php
-}
-?>
+
             <!-- XML -->
             <input type="radio" name="what" value="xml" id="radio_dump_xml" onclick="if(this.checked) { hide_them_all(); gE('none_options').style.display = 'block'; }; return true" />
             <label for="radio_dump_xml"><?php echo $strXML; ?></label>&nbsp;&nbsp;
@@ -197,10 +189,6 @@ echo "\n";
              </fieldset>
              
              <!-- CSV options -->
-<?php                    
-/* CSV export just for single table */
-if ($export_single) {
-?>
             <fieldset id="csv_options">
                 <legend><?php echo $strCSVOptions; ?></legend>
                 <table border="0" cellspacing="1" cellpadding="0">
@@ -240,17 +228,14 @@ if ($export_single) {
                 <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" />
                 <label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label>
             </fieldset>
-<?php
-}
-?>
+            
             <fieldset id="none_options">
                 <legend><?php echo $strNoOptions; ?></legend>
             </fieldset>
+
             <script type="text/javascript">
             <!--
-<?php if ($export_single) { ?>
                 gE('csv_options').style.display = 'none';
-<?php } ?>
                 gE('latex_options').style.display = 'none';
                 gE('sql_options').style.display = 'none';
                 gE('none_options').style.display = 'none';
@@ -258,10 +243,8 @@ if ($export_single) {
                     gE('sql_options').style.display = 'block';
                 } else if (document.getElementById('radio_dump_latex').checked) {
                     gE('latex_options').style.display = 'block';
-<?php if ($export_single) { ?>
                 } else if (document.getElementById('radio_dump_csv').checked) {
                     gE('csv_options').style.display = 'block';
-<?php } ?>
                 } else {
                     gE('none_options').style.display = 'block';
                 }
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index d0a351c0f..5a962771d 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -305,8 +305,6 @@ else {
 
     // latex case
     else if ($GLOBALS['what'] == 'latex') {
-
-
         $dump_buffer   .=    '% ' . $crlf
             .  '% phpMyAdmin LaTeX-Dump' . $crlf
             .  '% version ' . PMA_VERSION . $crlf
@@ -362,10 +360,28 @@ else {
             $add_character = str_replace('\\t', "\011", $add_character);
         } // end if
 
-        $tmp_buffer = '';
-        PMA_getTableCsv($db, $table, $limit_from, $limit_to, $separator, $enclosed, $escaped, 'PMA_myCsvHandler', $err_url
-            , (isset($sql_query)?urldecode($sql_query):''));
-        $dump_buffer .= $tmp_buffer;
+        if (isset($table_select)) {
+            $tmp_select = implode($table_select, '|');
+            $tmp_select = '|' . $tmp_select . '|';
+        }
+
+        $i = 0;
+        while ($i < $num_tables) {
+
+            if (!isset($single)) {
+                $table = PMA_mysql_tablename($tables, $i);
+            }
+            if (!isset($limit_from) || !isset($limit_to)) {
+                $limit_from = $limit_to = 0;
+            }
+            if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))
+                || (!isset($tmp_select) && !empty($table))) {
+                $tmp_buffer = '';
+                $dump_buffer .= PMA_getTableCsv($db, $table, $limit_from, $limit_to, $separator, $enclosed, $escaped, 'PMA_myCsvHandler', $err_url, (isset($sql_query)?urldecode($sql_query):''));
+                $dump_buffer .= $tmp_buffer;
+            }
+            $i++;
+        }
     } // end 'csv case
 } // end building the dump