#211182 by Damien Tournoud, David_Rothstein, clemens.tolboom, scor, hunmonk, et al: Allow updates to specify dependencies to ensure they run in a predictable order.

1 files changed, 23 insertions, 3 deletions

diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index 6865c6b6b..9eff90068 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -76,6 +76,29 @@ function comment_enable() {
 }
 
 /**
+ * Implements hook_update_dependencies().
+ */
+function comment_update_dependencies() {
+  // Comment update 7005 creates comment Field API bundles and therefore must
+  // run after the Field module has been enabled, but before upgrading field
+  // data.
+  $dependencies['comment'][7005] = array(
+    'system' => 7049,
+  );
+  $dependencies['system'][7050] = array(
+    'comment' => 7005,
+  );
+
+  // Comment update 7012 creates the comment body field and therefore must run
+  // after all entities have been updated.
+  $dependencies['comment'][7012] = array(
+    'system' => 7021,
+  );
+
+  return $dependencies;
+}
+
+/**
  * @defgroup updates-6.x-to-7.x Comment updates from 6.x to 7.x
  * @{
  */
@@ -248,9 +271,6 @@ function comment_update_7011() {
  * Create the comment_body field.
  */
 function comment_update_7012() {
-  // @todo Remove when http://drupal.org/node/211182 is fixed.
-  taxonomy_update_7002();
-
   // Create comment body field.
   $field = array(
     'field_name' => 'comment_body',