Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-23 12:28:22 +01:00
commit bedfc40cba
2 changed files with 2 additions and 1 deletions

View File

@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
- issue #11665 Format breaks query with COUNT()
- issue Undefinex index: SendErrorReports
- issue Incorrect script name in include
- issue #11685 Warning: Invalid argument supplied for foreach()
4.5.2.0 (not yet released)
- issue #11589 Incorrect parameter in mysqli_fetch_fields()

View File

@ -105,7 +105,7 @@ $ajax_reload = array();
if (! empty($sql_query)) {
// apply values for parameters
if (! empty($_REQUEST['parameterized'])) {
if (! empty($_REQUEST['parameterized']) && is_array($_REQUEST['parameters'])) {
$parameters = $_REQUEST['parameters'];
foreach ($parameters as $parameter => $replacement) {
$quoted = preg_quote($parameter);