diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-08 15:08:35 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-08 15:08:35 +0000 |
| commit | a11cfe610caa99063016c403bf4a3bfa8412227b (patch) | |
| tree | 13c05b4fb88d97ffc5b54f3e7ee1d25caddbf027 | |
| parent | 800c5a3fadeb0817c0236b997313681fed04faa0 (diff) | |
| download | brdo-a11cfe610caa99063016c403bf4a3bfa8412227b.tar.gz brdo-a11cfe610caa99063016c403bf4a3bfa8412227b.tar.bz2 | |
#799982 by tstoeckler, StuartJNCC: Fixed Updating D6 -> D7 fails if the D6 site has Date module applied.
| -rw-r--r-- | includes/update.inc | 8 |
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. |