From 63fbbff7e770ade174456c7271b2974041277b93 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Fri, 9 Nov 2001 13:42:31 +0000
Subject: [PATCH] Various updates to transaction and other support

git-svn-id: file:///svn/phpbb/trunk@1298 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/db/mssql.php | 1 +
 phpBB/db/odbc.php  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php
index e3bbd09be2..77fe808833 100644
--- a/phpBB/db/mssql.php
+++ b/phpBB/db/mssql.php
@@ -243,6 +243,7 @@ class sql_db
 			if($transaction == END_TRANSACTION)
 			{
 				$result = mssql_query("COMMIT", $this->db_connect_id);
+				$this->in_transaction = FALSE;
 			}
 
 			return $this->query_result;
diff --git a/phpBB/db/odbc.php b/phpBB/db/odbc.php
index 4922939ee7..c43407421f 100644
--- a/phpBB/db/odbc.php
+++ b/phpBB/db/odbc.php
@@ -41,8 +41,7 @@ class sql_db
 	//
 	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
 	{
-
-		if(eregi("^([[:alnum:]]+):([[:alnum:]]+)$", $sqlserver, $db_type))
+		if( preg_match("/^(.*?):(.*?)$/i", $sqlserver, $db_type) )
 		{
 			$this->persistency = $persistency;
 			$this->user = $sqluser;