summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/update.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/includes/update.inc b/includes/update.inc
index 3c8e051c2..13c85635c 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -482,7 +482,15 @@ function update_fix_d7_requirements() {
);
db_create_table('date_format_type', $schema['date_format_type']);
+ // Sites that have the Drupal 6 Date module installed already have the
+ // following tables.
+ if (db_table_exists('date_formats')) {
+ db_rename_table('date_formats', 'd6_date_formats');
+ }
db_create_table('date_formats', $schema['date_formats']);
+ if (db_table_exists('date_format_locale')) {
+ db_rename_table('date_format_locale', 'd6_date_format_locale');
+ }
db_create_table('date_format_locale', $schema['date_format_locale']);
// Add the queue table.