From 5735c5176e65905f8814b935000247fc8a4a88d0 Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Sun, 18 Jun 2006 15:35:32 +0000
Subject: [PATCH] fixes...

git-svn-id: file:///svn/phpbb/trunk@6099 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_database.php | 14 +++++++++++++-
 phpBB/includes/acp/acp_profile.php  |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 3cdb09bb5e..6d5d97e454 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -135,6 +135,7 @@ class acp_database
 						{
 							case 'sqlite':
 								$sql_data .= "BEGIN TRANSACTION;\n";
+								$sqlite_version = sqlite_libversion();
 							break;
 
 							case 'postgres':
@@ -157,7 +158,6 @@ class acp_database
 									case 'mysqli':
 									case 'mysql4':
 									case 'mysql':
-									case 'sqlite':
 										$sql_data .= '# Table: ' . $table_name . "\n";
 										$sql_data .= "DROP TABLE IF EXISTS $table_name;\n";
 									break;
@@ -167,6 +167,18 @@ class acp_database
 										$sql_data .= "DROP TABLE $table_name;\n\\\n";
 									break;
 
+									case 'sqlite':
+										$sql_data .= '# Table: ' . $table_name . "\n";
+										if (version_compare($sqlite_version, '3.0') == -1)
+										{
+											$sql_data .= "DROP TABLE $table_name;\n";
+										}
+										else
+										{
+											$sql_data .= "DROP TABLE IF EXISTS $table_name;\n";
+										}
+									break;
+
 									case 'postgres':
 									case 'firebird':
 										$sql_data .= '# Table: ' . $table_name . "\n";
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index f045f66e74..7299192773 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -917,7 +917,7 @@ class acp_profile
 			'field_hide'			=> $cp->vars['field_hide'],
 			'field_no_view'			=> $cp->vars['field_no_view']
 		);
-$db->sql_transaction('begin');
+
 		if ($action == 'create')
 		{
 			$profile_fields += array(
@@ -1381,7 +1381,7 @@ $db->sql_transaction('begin');
 			}
 		}
 
-$db->sql_transaction('commit');
+
 		$db->sql_transaction('begin');
 
 		if ($action == 'create')