diff options
| author | Damien Regad <dregad@mantisbt.org> | 2024-05-26 16:14:17 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2024-05-26 16:14:17 +0200 |
| commit | 5f589f64cea42c792929832cffe26825831f8c94 (patch) | |
| tree | 97338fe09be13cebf1da8372d81e735dfbc69ead | |
| parent | c0566a6df71b837f6cdc58cdd1c7aa875f62cd93 (diff) | |
| download | adodb-5f589f64cea42c792929832cffe26825831f8c94.tar.gz adodb-5f589f64cea42c792929832cffe26825831f8c94.tar.bz2 adodb-5f589f64cea42c792929832cffe26825831f8c94.zip | |
Reset fetch mode before return from MetaColumns()
Commit 249b7fb08569ce576cd1bf26098e00701145c6ec (PR #1017) introduced a
regression caused by returning from the function without resetting
$ADODB_FETCH_MODE to its original value.
Fixes #1016
| -rw-r--r-- | drivers/adodb-mysqli.inc.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php index 1c2b71ea..73632c28 100644 --- a/drivers/adodb-mysqli.inc.php +++ b/drivers/adodb-mysqli.inc.php @@ -963,13 +963,11 @@ class ADODB_mysqli extends ADOConnection { AND table_name='$table'"; $schemaArray = $this->getAssoc($SQL); - if (!$schemaArray) { - return false; + if (is_array($schemaArray)) { + $schemaArray = array_change_key_case($schemaArray,CASE_LOWER); + $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table)); } - $schemaArray = array_change_key_case($schemaArray,CASE_LOWER); - - $rs = $this->Execute(sprintf($this->metaColumnsSQL,$table)); if (isset($savem)) $this->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; if (!is_object($rs)) |