diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-07 09:04:01 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-07 09:04:01 -0500 |
| commit | 7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b (patch) | |
| tree | b21a52d3e26c2bdd58e129843d3675d0f240af24 /phpBB | |
| parent | e5aa2c9ac112156b56db9c4b1d8fc2b6f6f79265 (diff) | |
| download | forums-7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b.tar forums-7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b.tar.gz forums-7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b.tar.bz2 forums-7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b.tar.xz forums-7acbf98692dfe4b3bf1ca103a1fa90d7f51d3c1b.zip | |
[ticket/10057] Fixed wrong usage of sql_error again, in firebird.
This necessitates adding connect_error property to firebird.
PHPBB3-10057
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 660acb35db..fb820b4894 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -28,6 +28,7 @@ class dbal_firebird extends dbal var $last_query_text = ''; var $service_handle = false; var $affected_rows = 0; + var $connect_error = ''; /** * Connect to server @@ -57,7 +58,8 @@ class dbal_firebird extends dbal { if (!function_exists('ibase_pconnect')) { - return $this->sql_error('ibase_pconnect function does not exist, is interbase extension installed?'); + $this->connect_error = 'ibase_pconnect function does not exist, is interbase extension installed?'; + return $this->sql_error(''); } $this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3); } @@ -65,7 +67,8 @@ class dbal_firebird extends dbal { if (!function_exists('ibase_connect')) { - return $this->sql_error('ibase_connect function does not exist, is interbase extension installed?'); + $this->connect_error = 'ibase_connect function does not exist, is interbase extension installed?'; + return $this->sql_error(''); } $this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3); } |