diff options
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | update.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 92adc499b..ae708d49e 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -3422,7 +3422,7 @@ function system_update_7021() { variable_del('site_footer'); // Rebuild theme data, so the new 'help' region is identified. - system_theme_data(); + system_get_theme_data(); return $ret; } 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; |