bug #1859460, prevent an empty target_db field to produce a failure, …

…thanks to windkiel
phpmyadmin · Dec 30, 2007 · 823687a · 823687a
1 parent 683a3e0
commit 823687a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
@@ -28,6 +28,14 @@
 
 $goto = $cfg['DefaultTabTable'];
 
+/** 
+ * $_REQUEST['target_db'] could be empty in case we came from an input field 
+ * (when there are many databases, no drop-down)
+ */
+if (empty($_REQUEST['target_db'])) {
+    $_REQUEST['target_db'] = $db;
+}
+
 /**
  * A target table name has been sent to this script -> do the work
  */

diff --git a/tbl_operations.php b/tbl_operations.php
@@ -211,7 +211,7 @@
     <legend><?php echo $strMoveTable; ?></legend>
 <?php if ($GLOBALS['PMA_List_Database']->count() > $GLOBALS['cfg']['MaxDbList']) {
 ?>
-    <input type="text" maxlength="100" size="30" name="target_db" />
+    <input type="text" maxlength="100" size="30" name="target_db" value="<?php echo htmlspecialchars($GLOBALS['db']); ?>"/>
 <?php
     } else {
 ?>
@@ -370,7 +370,7 @@
     <legend><?php echo $strCopyTable; ?></legend>
 <?php if ($GLOBALS['PMA_List_Database']->count() > $GLOBALS['cfg']['MaxDbList']) {
 ?>
-    <input type="text" maxlength="100" size="30" name="target_db" />
+    <input type="text" maxlength="100" size="30" name="target_db" value="<?php echo htmlspecialchars($GLOBALS['db']); ?>"/>
 <?php
     } else {
 ?>