diff options
| author | Damien Regad <dregad@mantisbt.org> | 2018-03-30 18:47:26 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2018-03-30 18:47:26 +0200 |
| commit | bd898bf510431e2f8bce2469d188821e200af29f (patch) | |
| tree | c0b49b1f62e2c396bdd91ea09116f03cf344f70b /drivers/adodb-sybase.inc.php | |
| parent | 62ebb04b157467f4e650ef0e7a02120a2b41c169 (diff) | |
| parent | d29c23f2264ec95c6d3851e0f51ce240b2f36b74 (diff) | |
| download | adodb-bd898bf510431e2f8bce2469d188821e200af29f.tar.gz adodb-bd898bf510431e2f8bce2469d188821e200af29f.tar.bz2 adodb-bd898bf510431e2f8bce2469d188821e200af29f.zip | |
Merge branch 'hotfix/5.20'
I messed up the merge at c350c007ed585a4da4dc8c62ae7954cfe13b621f. Not
sure what I did or how, but the changes from the hotfix branch got lost.
Redoing the merge to fix the problem.
Diffstat (limited to 'drivers/adodb-sybase.inc.php')
| -rw-r--r-- | drivers/adodb-sybase.inc.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php index 52e7ecb7..8604e24c 100644 --- a/drivers/adodb-sybase.inc.php +++ b/drivers/adodb-sybase.inc.php @@ -113,8 +113,11 @@ class ADODB_sybase extends ADOConnection { if ($this->_logsql) return $this->_errorMsg; if (function_exists('sybase_get_last_message')) $this->_errorMsg = sybase_get_last_message(); - else - $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform'; + else { + $err = error_get_last(); + $this->_errorMsg = $err ? $err['message'] : 'SYBASE error messages not supported on this platform'; + } + return $this->_errorMsg; } |