Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
This commit is contained in:
commit
e10f55efcd
@ -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()
|
||||
|
||||
@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user