From 0007136dd9cd1618959f6bdbb8b1f90c5224ca83 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 19 Oct 2015 09:11:57 -0400 Subject: [PATCH] Fixes #11589 Incorrect parameter in mysqli_fetch_fields() Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/Table.class.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 945c43be17..0cae9c4872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.5.2.0 (not yet released) +- issue #11589 Incorrect parameter in mysqli_fetch_fields() 4.5.1.0 (not yet released) - issue Invalid argument supplied for foreach() diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 8de07d1c98..dcea9a4e92 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1473,7 +1473,12 @@ class PMA_Table PMA_Util::backquote($this->_name) ); $move_columns_sql_result = $this->_dbi->tryQuery($move_columns_sql_query); - return $this->_dbi->getFieldsMeta($move_columns_sql_result); + if ($move_columns_sql_result !== false) { + return $this->_dbi->getFieldsMeta($move_columns_sql_result); + } else { + // unsure how to reproduce but it was seen on the reporting server + return array(); + } } /**