From a7225f2952e6155c6bf29211ff996e0914b28b4b Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 2 Aug 2006 17:38:48 +0000
Subject: [PATCH] ok, but this time...

git-svn-id: file:///svn/phpbb/trunk@6230 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/firebird.php | 17 +++++++++++++----
 1 file 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;