diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-09 13:42:31 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-09 13:42:31 +0000 |
| commit | 63fbbff7e770ade174456c7271b2974041277b93 (patch) | |
| tree | 5f97a16e5c92f3c160e7b6279007d633e5c618f3 /phpBB/db | |
| parent | 4e0ec70803fbe176cda9775d34aacefedc4cd4cb (diff) | |
| download | forums-63fbbff7e770ade174456c7271b2974041277b93.tar forums-63fbbff7e770ade174456c7271b2974041277b93.tar.gz forums-63fbbff7e770ade174456c7271b2974041277b93.tar.bz2 forums-63fbbff7e770ade174456c7271b2974041277b93.tar.xz forums-63fbbff7e770ade174456c7271b2974041277b93.zip | |
Various updates to transaction and other support
git-svn-id: file:///svn/phpbb/trunk@1298 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db')
| -rw-r--r-- | phpBB/db/mssql.php | 1 | ||||
| -rw-r--r-- | 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; |