From d89758d05ad61f972e11492eff5b7bba7706db77 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 9 Jun 2009 11:20:16 +0000
Subject: - Patch #486090 by catch: fixed upgrade path from Drupal 6 to Drupal
 7.

---
 update.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'update.php')

diff --git a/update.php b/update.php
index 9facd3f51..ac664d49e 100644
--- a/update.php
+++ b/update.php
@@ -653,7 +653,9 @@ function update_fix_d7_requirements() {
     variable_set('update_d7_requirements', TRUE);
 
     // Add column for locale context.
-    db_add_field($ret, 'locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.'));
+    if (db_table_exists('locales_source')) {
+      db_add_field($ret, 'locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.'));
+    }
   }
 
   return $ret;
-- 
cgit v1.2.3