Merge branch 'QA_4_5'

phpmyadmin · Dec 28, 2015 · fb6e971 · fb6e971
2 parents cd3c5d6 + 9a40c11
commit fb6e971
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
 - issue #11786 Fixed Kanji encoding in some specific cases
 - issue #11787 Check whether iconv works before using it
 - issue #11788 Avoid conversion of MySQL error messages
+- issue #11792 Undefined index: parameters
 
 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2

diff --git a/import.php b/import.php
@@ -104,7 +104,9 @@
 if (! empty($sql_query)) {
 
     // apply values for parameters
-    if (! empty($_REQUEST['parameterized']) && is_array($_REQUEST['parameters'])) {
+    if (! empty($_REQUEST['parameterized'])
+        && ! empty($_REQUEST['parameters'])
+        && is_array($_REQUEST['parameters'])) {
         $parameters = $_REQUEST['parameters'];
         foreach ($parameters as $parameter => $replacement) {
             $quoted = preg_quote($parameter);