diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-01 03:13:08 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-01 03:13:08 +0000 |
| commit | 9a685e7a4839058a99ddcb5f9c79c126f5ce318b (patch) | |
| tree | d7ca4a398200640041c540cc3e71fe8780c0a727 /phpBB/includes/acp | |
| parent | 2db7def46a2172a8611fc232a53b4484f6fbe22d (diff) | |
| download | forums-9a685e7a4839058a99ddcb5f9c79c126f5ce318b.tar forums-9a685e7a4839058a99ddcb5f9c79c126f5ce318b.tar.gz forums-9a685e7a4839058a99ddcb5f9c79c126f5ce318b.tar.bz2 forums-9a685e7a4839058a99ddcb5f9c79c126f5ce318b.tar.xz forums-9a685e7a4839058a99ddcb5f9c79c126f5ce318b.zip | |
- should fix some Firebird issues ( can't believe that nobody found this until now )
git-svn-id: file:///svn/phpbb/trunk@6954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 16 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 12 |
3 files changed, 36 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index c5fadbfd0a..87c40ef78f 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -167,6 +167,7 @@ class acp_database // Get the table structure if ($structure) { + $sql_data .= "\n"; switch ($db->sql_layer) { case 'mysqli': @@ -213,7 +214,18 @@ class acp_database else { // We might wanna empty out all that junk :D - $sql_data .= (($db->sql_layer == 'sqlite') ? 'DELETE FROM ' : 'TRUNCATE TABLE ') . $table_name . ";\n"; + switch ($db->sql_layer) + { + case 'sqlite': + case 'firebird': + $sql_data .= 'DELETE FROM '; + break; + + default: + $sql_data .= 'TRUNCATE TABLE '; + break; + } + $sql_data .= $table_name . ";\n"; } // Now write the data for the first time. :) @@ -757,7 +769,7 @@ class acp_database if ($retrieved_data) { - $sql_data = "\nGO\n"; + $sql_data = "GO\n"; if ($ident_set) { $sql_data .= "\nSET IDENTITY_INSERT $table_name OFF\nGO\n"; diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 321df3ecb1..bcdd8c71d8 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -334,7 +334,17 @@ class acp_icons // The user has already selected a smilies_pak file if ($current == 'delete') { - $db->sql_query((($db->sql_layer != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . $table); + switch ($db->sql_layer) + { + case 'sqlite': + case 'firebird': + $db->sql_query('DELETE FROM ' . $table); + break; + + default: + $db->sql_query('TRUNCATE TABLE ' . $table); + break; + } switch ($mode) { diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index fad9ad47b7..bf958ba319 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -147,7 +147,17 @@ class acp_main break; case 'db_track': - $db->sql_query((($db->sql_layer != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . TOPICS_POSTED_TABLE); + switch ($db->sql_layer) + { + case 'sqlite': + case 'firebird': + $db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE); + break; + + default: + $db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE); + break; + } // This can get really nasty... therefore we only do the last six months $get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60); |