diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 04:50:41 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-04 04:50:41 -0500 |
| commit | 9f549e8249acbd82b68e961a6e0a31de47d9ca32 (patch) | |
| tree | 6d99df2095646589f3fc66271d47835a58fe79c4 /phpBB/includes/db/oracle.php | |
| parent | 1a7e2211c35218094e30ddc399d4aa6b45fe75f4 (diff) | |
| download | forums-9f549e8249acbd82b68e961a6e0a31de47d9ca32.tar forums-9f549e8249acbd82b68e961a6e0a31de47d9ca32.tar.gz forums-9f549e8249acbd82b68e961a6e0a31de47d9ca32.tar.bz2 forums-9f549e8249acbd82b68e961a6e0a31de47d9ca32.tar.xz forums-9f549e8249acbd82b68e961a6e0a31de47d9ca32.zip | |
[ticket/10205] Fix remaining db drivers.
PHPBB3-10205
Diffstat (limited to 'phpBB/includes/db/oracle.php')
| -rw-r--r-- | phpBB/includes/db/oracle.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 42f5de1b24..b234d8b45e 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -674,17 +674,27 @@ class dbal_oracle extends dbal */ function _sql_error() { - $error = @ocierror(); - $error = (!$error) ? @ocierror($this->query_result) : $error; - $error = (!$error) ? @ocierror($this->db_connect_id) : $error; - - if ($error) + if (function_exists('ocierror')) { - $this->last_error_result = $error; + $error = @ocierror(); + $error = (!$error) ? @ocierror($this->query_result) : $error; + $error = (!$error) ? @ocierror($this->db_connect_id) : $error; + + if ($error) + { + $this->last_error_result = $error; + } + else + { + $error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array(); + } } else { - $error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array(); + $error = array( + 'message' => $this->connect_error, + 'code' => '', + ); } return $error; |