makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6099 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-06-18 15:35:32 +00:00
parent ef9b725379
commit 5735c5176e
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/acp/acp_database.php
View file

@ -135,6 +135,7 @@ class acp_database
{ {
case 'sqlite': case 'sqlite':
$sql_data .= "BEGIN TRANSACTION;\n"; $sql_data .= "BEGIN TRANSACTION;\n";
$sqlite_version = sqlite_libversion();
break; break;
case 'postgres': case 'postgres':
@ -157,7 +158,6 @@ class acp_database
case 'mysqli': case 'mysqli':
case 'mysql4': case 'mysql4':
case 'mysql': case 'mysql':
case 'sqlite':
$sql_data .= '# Table: ' . $table_name . "\n"; $sql_data .= '# Table: ' . $table_name . "\n";
$sql_data .= "DROP TABLE IF EXISTS $table_name;\n"; $sql_data .= "DROP TABLE IF EXISTS $table_name;\n";
break; break;
@ -167,6 +167,18 @@ class acp_database
$sql_data .= "DROP TABLE $table_name;\n\\\n"; $sql_data .= "DROP TABLE $table_name;\n\\\n";
break; 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 'postgres':
case 'firebird': case 'firebird':
$sql_data .= '# Table: ' . $table_name . "\n"; $sql_data .= '# Table: ' . $table_name . "\n";

4
phpBB/includes/acp/acp_profile.php
View file

@ -917,7 +917,7 @@ class acp_profile
'field_hide' => $cp->vars['field_hide'], 'field_hide' => $cp->vars['field_hide'],
'field_no_view' => $cp->vars['field_no_view'] 'field_no_view' => $cp->vars['field_no_view']
); );
$db->sql_transaction('begin');
if ($action == 'create') if ($action == 'create')
{ {
$profile_fields += array( $profile_fields += array(
@ -1381,7 +1381,7 @@ $db->sql_transaction('begin');
} }
} }
$db->sql_transaction('commit');
$db->sql_transaction('begin'); $db->sql_transaction('begin');
if ($action == 'create') if ($action == 'create')