diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-02 17:38:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-02 17:38:48 +0000 |
| commit | a7225f2952e6155c6bf29211ff996e0914b28b4b (patch) | |
| tree | 6b989e8a14e2b6423c0279fd5142f23ea0e4b07b | |
| parent | a07193a22aa348ae5bad117bcb7b7e845d51907b (diff) | |
| download | forums-a7225f2952e6155c6bf29211ff996e0914b28b4b.tar forums-a7225f2952e6155c6bf29211ff996e0914b28b4b.tar.gz forums-a7225f2952e6155c6bf29211ff996e0914b28b4b.tar.bz2 forums-a7225f2952e6155c6bf29211ff996e0914b28b4b.tar.xz forums-a7225f2952e6155c6bf29211ff996e0914b28b4b.zip | |
ok, but this time...
git-svn-id: file:///svn/phpbb/trunk@6230 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/db/firebird.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index 9654bb9610..7ea5dd3612 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -46,9 +46,6 @@ class dbal_firebird extends dbal $this->db_connect_id = ($this->persistency) ? @ibase_pconnect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3); - /** - * @todo evaluate the implications of opening a service connection - */ $this->service_handle = (function_exists('ibase_service_attach')) ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false; return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); @@ -76,7 +73,7 @@ class dbal_firebird extends dbal switch ($status) { case 'begin': - return @ibase_trans(); + return true; break; case 'commit': @@ -117,6 +114,18 @@ class dbal_firebird extends dbal $this->sql_error($query); } + if (!$this->transaction) + { + if (function_exists('ibase_commit_ret')) + { + @ibase_commit_ret(); + } + else + { + @ibase_commit(); + } + } + if ($cache_ttl && method_exists($cache, 'sql_save')) { $this->open_queries[(int) $this->query_result] = $this->query_result; |