diff options
| author | Damien Regad <dregad@mantisbt.org> | 2022-05-09 15:30:48 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2022-05-09 15:30:48 +0200 |
| commit | aa1dbf78b500db9a4f63973ddb42c125b0018033 (patch) | |
| tree | e62373677769b24f67b0323e331a551854c66f4c /drivers | |
| parent | 4a6bccd8273bb2bac8fe111d5247a37bfe451de1 (diff) | |
| download | adodb-aa1dbf78b500db9a4f63973ddb42c125b0018033.tar.gz adodb-aa1dbf78b500db9a4f63973ddb42c125b0018033.tar.bz2 adodb-aa1dbf78b500db9a4f63973ddb42c125b0018033.zip | |
mssql: Fix undefined variable when closing connection
Also remove redundant assignment of $this->_connectionID, which is
already set to false in ADOConnection::close().
Fixes #835
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/adodb-mssqlnative.inc.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php index 89eb42ed..27371f79 100644 --- a/drivers/adodb-mssqlnative.inc.php +++ b/drivers/adodb-mssqlnative.inc.php @@ -667,17 +667,21 @@ class ADODB_mssqlnative extends ADOConnection { return $rez; } - // returns true or false + /** + * Rolls back pending transactions and closes the connection. + * + * @return bool True, unless the connection id is invalid + */ function _close() { if ($this->transCnt) { $this->RollbackTrans(); } - if($this->_connectionID) { - $rez = sqlsrv_close($this->_connectionID); + if ($this->_connectionID) { + return sqlsrv_close($this->_connectionID); } $this->_connectionID = false; - return $rez; + return true; } |
