summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/filter/filter.install3
-rw-r--r--modules/system/system.install1
-rw-r--r--modules/taxonomy/taxonomy.install4
3 files changed, 6 insertions, 2 deletions
diff --git a/modules/filter/filter.install b/modules/filter/filter.install
index 337a06698..743248149 100644
--- a/modules/filter/filter.install
+++ b/modules/filter/filter.install
@@ -113,8 +113,9 @@ function filter_update_dependencies() {
// Filter update 7005 migrates block data and therefore needs to run after
// the {block_custom} table is properly set up.
$dependencies['filter'][7005] = array(
- 'system' => 7037,
+ 'taxonomy' => 7002,
);
+
return $dependencies;
}
diff --git a/modules/system/system.install b/modules/system/system.install
index e3285ce43..5c9d19c78 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2021,7 +2021,6 @@ function system_update_7018() {
db_drop_index('system', 'type_name');
db_change_field('system', 'type', 'type', array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => ''));
db_add_index('system', 'type_name', array('type', 'name'));
- db_add_index('system', 'system_list', array('weight', 'name'));
}
/**
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index d84797fcb..1a98b0d75 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -215,6 +215,9 @@ function taxonomy_update_dependencies() {
$dependencies['taxonomy'][7002] = array(
'system' => 7049,
);
+ $dependencies['user'][7006] = array(
+ 'taxonomy' => 7002,
+ );
$dependencies['system'][7050] = array(
'taxonomy' => 7002,
);
@@ -222,6 +225,7 @@ function taxonomy_update_dependencies() {
$dependencies['node'][7006] = array(
'taxonomy' => 7002,
);
+
return $dependencies;
}