diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | docs/changelog.md | 7 | ||||
| -rw-r--r-- | drivers/adodb-mysqli.inc.php | 5 |
3 files changed, 10 insertions, 3 deletions
@@ -6,4 +6,5 @@ .project .settings/ /nbproject/ +.idea/ diff --git a/docs/changelog.md b/docs/changelog.md index b9dc09bd..86e56a74 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -18,7 +18,6 @@ Older changelogs: - adodb: fix getAssoc(). #189, #198, #204 - adodb: Improve array identification in ADOrecordset::getAssoc(). #101 - adodb: MetaColumns() consistently returns Actual Type by default in all drivers. #184, #133 -- adodb: Fix BulkBind() param count validation. #199 - adodb: Add new value defaulting mode for getInsertSQL(). #214 - firebird: updated driver, thanks to Lester Caine. #201 - mssqlnative: Query not returning id. #185 @@ -36,6 +35,12 @@ Older changelogs: - sqlite: driver did not support metaForeignKeys. #179 - session: add 'httponly' flag to cookie. #190 +## 5.20.4 - 30-Mar-2016 + +- adodb: Fix BulkBind() param count validation. #199 +- mysqli: fix PHP warning in recordset destructor. #217 +- mysqli: cast port number to int when connecting (PHP7 compatibility). #218 + ## 5.20.3 - 01-Jan-2016 - mssql: PHP warning when closing recordset from destructor not fixed in v5.20.2. #180 diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php index 0d596c32..41cb0854 100644 --- a/drivers/adodb-mysqli.inc.php +++ b/drivers/adodb-mysqli.inc.php @@ -135,7 +135,8 @@ class ADODB_mysqli extends ADOConnection { $argUsername, $argPassword, $argDatabasename, - $this->port, + # PHP7 compat: port must be int. Use default port if cast yields zero + (int)$this->port != 0 ? (int)$this->port : 3306, $this->socket, $this->clientFlags); @@ -1131,7 +1132,7 @@ class ADORecordSet_mysqli extends ADORecordSet{ } } - if($this->_queryID) { + if($this->_queryID instanceof mysqli_result) { mysqli_free_result($this->_queryID); } $this->_queryID = false; |