summaryrefslogtreecommitdiff
path: root/drivers/adodb-odbc_oracle.inc.php
diff options
context:
space:
mode:
authorDamien Regad <dregad@mantisbt.org>2018-03-30 01:18:24 +0200
committerDamien Regad <dregad@mantisbt.org>2018-03-30 01:19:24 +0200
commit60c48af0bf265a200070466aa4de97dd5126ed06 (patch)
treeef749cc368cef9953a261f890df90266ffefe02f /drivers/adodb-odbc_oracle.inc.php
parent7756fa6026aa55bfca7acef99846325142687508 (diff)
downloadadodb-60c48af0bf265a200070466aa4de97dd5126ed06.tar.gz
adodb-60c48af0bf265a200070466aa4de97dd5126ed06.tar.bz2
adodb-60c48af0bf265a200070466aa4de97dd5126ed06.zip
Replace $php_errormsg with error_get_last()
Reserved variable $php_errormsg is deprecated in PHP 7.2 http://php.net/manual/en/reserved.variables.phperrormsg.php Fixes #405
Diffstat (limited to 'drivers/adodb-odbc_oracle.inc.php')
-rw-r--r--drivers/adodb-odbc_oracle.inc.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/adodb-odbc_oracle.inc.php b/drivers/adodb-odbc_oracle.inc.php
index 91416d21..ded5fcc9 100644
--- a/drivers/adodb-odbc_oracle.inc.php
+++ b/drivers/adodb-odbc_oracle.inc.php
@@ -76,11 +76,10 @@ class ADODB_odbc_oracle extends ADODB_odbc {
// returns true or false
function _connect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
- global $php_errormsg;
-
- $php_errormsg = '';
+ error_clear_last();
$this->_connectionID = odbc_connect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
- $this->_errorMsg = $php_errormsg;
+ $err = error_get_last();
+ $this->_errorMsg = $err ? $err['message'] : '';
$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);
@@ -89,10 +88,10 @@ class ADODB_odbc_oracle extends ADODB_odbc {
// returns true or false
function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename)
{
- global $php_errormsg;
- $php_errormsg = '';
+ error_clear_last();
$this->_connectionID = odbc_pconnect($argDSN,$argUsername,$argPassword,SQL_CUR_USE_ODBC );
- $this->_errorMsg = $php_errormsg;
+ $err = error_get_last();
+ $this->_errorMsg = $err ? $err['message'] : '';
$this->Execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
//if ($this->_connectionID) odbc_autocommit($this->_connectionID,true);