diff --git modules/filter/filter.install modules/filter/filter.install index 2f2930a..6bbcf7a 100644 --- modules/filter/filter.install +++ 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 modules/system/system.install modules/system/system.install index 4ad4fd7..d25a3d7 100644 --- modules/system/system.install +++ 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 modules/taxonomy/taxonomy.install modules/taxonomy/taxonomy.install index 71ab907..5099624 100644 --- modules/taxonomy/taxonomy.install +++ 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; } diff --git sites/all/README.txt sites/all/README.txt old mode 100644 new mode 100755 diff --git sites/all/modules/README.txt sites/all/modules/README.txt old mode 100644 new mode 100755 diff --git sites/all/themes/README.txt sites/all/themes/README.txt old mode 100644 new mode 100755