diff options
| author | Mark Newnham <mark@newnhams.com> | 2020-03-28 14:14:02 -0600 |
|---|---|---|
| committer | Mark Newnham <mark@newnhams.com> | 2020-03-28 14:14:02 -0600 |
| commit | aef72dd137ea661977f8c2c83d3e4747c20c65fe (patch) | |
| tree | 2de47e51024911d6fe147ccdfe2ac4f054fcf209 | |
| parent | 0d812dca0628d835c25bbef465200fd9075f8880 (diff) | |
| parent | 0e813bcc8da0985559ec9e9ce7b3ba882f381d9a (diff) | |
| download | adodb-aef72dd137ea661977f8c2c83d3e4747c20c65fe.tar.gz adodb-aef72dd137ea661977f8c2c83d3e4747c20c65fe.tar.bz2 adodb-aef72dd137ea661977f8c2c83d3e4747c20c65fe.zip | |
Merge branch 'hotfix/5.20' of https://github.com/ADOdb/ADOdb into hotfix/5.20
| -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 8ca4f585..269144e1 100644 --- a/adodb.inc.php +++ b/adodb.inc.php @@ -302,8 +302,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 5c6774fb..5c0ab871 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -5,6 +5,10 @@ Older changelogs: [v3.x](changelog_v3.x.md), [v2.x](changelog_v2.x.md). +## 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 |