Merge remote-tracking branch 'origin/master'

2014-07-08 00:02:50 +02:00 · 2014-07-08 00:02:50 +02:00 · 2e4cd6dd9b
commit 2e4cd6dd9b
parent eef83e3f0f 52718ec208
2 changed files with 7 additions and 0 deletions
--- a/1
+++ b/1
@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
 - bug #4482 Multi Column sorting (improved user experience)
 - bug #4478 Server validation does not work while in setup/mysqli
 - bug       Undefined variable when grid editing a foreign key column
+- bug #4481 mult_submits.inc.php Undefined variable Error

 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@ -132,6 +132,12 @@ if (! empty($submit_mult)
    }
 } // end if

+if (empty($db)) {
+    $db = '';
+}
+if (empty($table)) {
+    $table = '';
+}
 $views = $GLOBALS['dbi']->getVirtualTables($db);

 /**