diff options
| author | Damien Regad <dregad@mantisbt.org> | 2020-01-30 10:44:16 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2020-01-30 10:44:16 +0100 |
| commit | 33be3dba611bb0beba1cfa62dd644e3bd81c2255 (patch) | |
| tree | fb0a7faab7a54eec85c51a3a7cbeabeaf4e4296c | |
| parent | 517c8adc141d9375079729d0cf04deb8c6840113 (diff) | |
| parent | 0e813bcc8da0985559ec9e9ce7b3ba882f381d9a (diff) | |
| download | adodb-33be3dba611bb0beba1cfa62dd644e3bd81c2255.tar.gz adodb-33be3dba611bb0beba1cfa62dd644e3bd81c2255.tar.bz2 adodb-33be3dba611bb0beba1cfa62dd644e3bd81c2255.zip | |
Merge remote-tracking branch 'origin/hotfix/5.20'
# Conflicts:
# docs/changelog.md
| -rw-r--r-- | adodb.inc.php | 4 | ||||
| -rw-r--r-- | docs/changelog.md | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/adodb.inc.php b/adodb.inc.php index 7aef8c9b..4ae8cad7 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -288,8 +288,8 @@ if (!defined('_ADODB_LAYER')) { //print "Errorno ($fn errno=$errno m=$errmsg) "; $thisConnection->_transOK = false; if ($thisConnection->_oldRaiseFn) { - $fn = $thisConnection->_oldRaiseFn; - $fn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection); + $errfn = $thisConnection->_oldRaiseFn; + $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2,$thisConnection); } } diff --git a/docs/changelog.md b/docs/changelog.md index 3a0c4166..d2098b5c 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -99,6 +99,10 @@ Older changelogs: - xml: fix invalid xmlschema03.dtd and descr tag in session schema XML. #595 - loadbalancer (new feature): read/write splitting and load balancing across multiple connections, thanks to Mike Benoit. #111 +## 5.20.17 - Unreleased + +- core: fix PHP notice in ADOdb_Exception constructor when using transactions. #601 + ## 5.20.16 - 12-Jan-2020 - mssql: queries are not correctly closed. #590 |