diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-06 20:55:41 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-06 23:10:09 -0500 |
| commit | af43ed655bf31ae4b9ef999e0a95eeae67724597 (patch) | |
| tree | 1fdf575a69b09f623c801045cb1e6cf659920f5d /phpBB | |
| parent | 22004fa7d65b19e8bfe96a97042a614be1adf444 (diff) | |
| download | forums-af43ed655bf31ae4b9ef999e0a95eeae67724597.tar forums-af43ed655bf31ae4b9ef999e0a95eeae67724597.tar.gz forums-af43ed655bf31ae4b9ef999e0a95eeae67724597.tar.bz2 forums-af43ed655bf31ae4b9ef999e0a95eeae67724597.tar.xz forums-af43ed655bf31ae4b9ef999e0a95eeae67724597.zip | |
[ticket/10057] Split statements in firebird dbal for readability.
PHPBB3-10057
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 6f60dd5dad..2f17b00b3f 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -53,9 +53,23 @@ class dbal_firebird extends dbal $use_database = $this->server . ':' . $this->dbname; } - $this->db_connect_id = ($this->persistency) ? @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3); + if ($this->persistency) + { + $this->db_connect_id = @ibase_pconnect($use_database, $this->user, $sqlpassword, false, false, 3); + } + else + { + $this->db_connect_id = @ibase_connect($use_database, $this->user, $sqlpassword, false, false, 3); + } - $this->service_handle = (function_exists('ibase_service_attach') && $this->server) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false; + if (function_exists('ibase_service_attach') && $this->server) + { + $this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword); + } + else + { + $thih->service_handle = false; + } return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); } |