diff options
| -rw-r--r-- | adodb.inc.php | 5 | ||||
| -rw-r--r-- | docs/changelog.md | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/adodb.inc.php b/adodb.inc.php index 9b00df8b..8fbd5f04 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -3433,6 +3433,11 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1 return false; } + // Empty recordset + if (!$this->fields) { + return array(); + } + // Determine whether the array is associative or 0-based numeric $numIndex = array_keys($this->fields) == range(0, count($this->fields) - 1); diff --git a/docs/changelog.md b/docs/changelog.md index 75be8313..ccb94efa 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,6 +6,11 @@ Older changelogs: [v2.x](changelog_v2.x.md). +## 5.20.1 - 01-Dec-2015 + +- adodb: Fix regression introduced in 5.20.0, causing a PHP Warning when + calling GetAssoc() with a query returning 0 rows. See Github #162 + ## 5.20.0 - 28-Nov-2015 - adodb: Fix regression introduced in v5.19, causing queries to return empty rows. See Github #20, #93, #95 |