diff --git a/ChangeLog b/ChangeLog
index ec433548a..357243634 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-21 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * db_details_export.php:
+      - replaced for() with foreach()
+      - dont pollute $GLOBALS['table']
+    
 2005-10-20 Marc Delisle  <lem9@users.sourceforge.net>
     * server_databases.php: security fix
     * libraries/common.lib.php, /grab_globals.lib.php: security fix
diff --git a/db_details_export.php b/db_details_export.php
index ffe2e6f86..6c88163a3 100644
--- a/db_details_export.php
+++ b/db_details_export.php
@@ -1,59 +1,66 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-
+/**
+ * dumps a database
+ *
+ * @uses    db_details_common.php
+ * @uses    db_details_db_info.php
+ * @uses    libraries/display_export.lib.php
+ * @uses    $tables     from db_details_db_info.php
+ */
 
 /**
  * Gets some core libraries
  */
 $sub_part  = '_export';
-require('./db_details_common.php');
+require_once('./db_details_common.php');
 $url_query .= '&amp;goto=db_details_export.php';
-require('./db_details_db_info.php');
-?>
-<!-- Dump of Database -->
-<?php
+require_once('./db_details_db_info.php');
+
 /**
  * Displays the form
  */
 $export_page_title = $strViewDumpDB;
 
-$multi_values = '';
-if ($num_tables > 1) {
-
-    $multi_values = '<div align="center"><select name="table_select[]" size="6" multiple="multiple">';
-    $multi_values .= "\n";
-
-    for ($i = 0; $i < $num_tables; $i++) {
-        if (PMA_MYSQL_INT_VERSION >= 50000 && is_null($tables[$i]['Engine'])) {
-            // Don't offer to export views yet.
-            continue;
-        }
-        $table   = $tables[$i]['Name'];
-        if (!empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|'))) {
-            $is_selected = ' selected="selected"';
-        } else {
-            $is_selected = '';
-        }
-        $table   = htmlspecialchars($table);
-        $multi_values .= '                <option value="' . $table . '"' . $is_selected . '>' . $table . '</option>' . "\n";
-    } // end for
-    $multi_values .= "\n";
-    $multi_values .= '</select></div>';
-
-    $checkall_url = 'db_details_export.php?'
-                  . PMA_generate_common_url($db)
-                  . '&amp;goto=db_details_export.php';
-
-    $multi_values .= '<br />
-            <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
-            &nbsp;/&nbsp;
-            <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>';
-} elseif ($num_tables == 0) {
+// exit if no tables in db found
+if ( $num_tables < 1 ) {
     echo $strDatabaseNoTable;
-    require_once('./footer.inc.php');
+    require('./footer.inc.php');
+    exit;
 } // end if
 
+$multi_values = '<div align="center"><select name="table_select[]" size="6" multiple="multiple">';
+$multi_values .= "\n";
+
+foreach ( $tables as $each_table ) {
+    if ( PMA_MYSQL_INT_VERSION >= 50000 && is_null($each_table['Engine']) ) {
+        // Don't offer to export views yet.
+        continue;
+    }
+    if ( ! empty( $selectall )
+      || ( isset( $tmp_select ) 
+           && false !== strpos( $tmp_select, '|' . $each_table['Name'] . '|') ) ) {
+        $is_selected = ' selected="selected"';
+    } else {
+        $is_selected = '';
+    }
+    $table_html   = htmlspecialchars( $each_table['Name'] );
+    $multi_values .= '                <option value="' . $table_html . '"' 
+        . $is_selected . '>' . $table_html . '</option>' . "\n";
+} // end for
+$multi_values .= "\n";
+$multi_values .= '</select></div>';
+
+$checkall_url = 'db_details_export.php?'
+              . PMA_generate_common_url( $db )
+              . '&amp;goto=db_details_export.php';
+
+$multi_values .= '<br />
+        <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
+        /
+        <a href="' . $checkall_url . '" onclick="setSelectOptions(\'dump\', \'table_select[]\', false); return false;">' . $strUnselectAll . '</a>';
+
 $export_type = 'database';
 require_once('./libraries/display_export.lib.php');