diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2011-08-06 16:29:31 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-08-06 16:29:31 -0700 |
commit | 1e48014398e19d334bb0b6e5ac517265b575a6f4 (patch) | |
tree | 11b0e38f2cf212ca48bfb8946c3f446abe354061 /modules/node/node.install | |
parent | 3af0b234d2d9d0be8bf578096d621a57eaf3481a (diff) | |
download | brdo-1e48014398e19d334bb0b6e5ac517265b575a6f4.tar.gz brdo-1e48014398e19d334bb0b6e5ac517265b575a6f4.tar.bz2 |
Issue #717834 by David_Rothstein, clemens.tolboom, catch: Fixed The dependencies declared in core's hook_update_dependencies() implementations aren't actually correct.
Diffstat (limited to 'modules/node/node.install')
-rw-r--r-- | modules/node/node.install | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/modules/node/node.install b/modules/node/node.install index 2498091fc..d33f095f0 100644 --- a/modules/node/node.install +++ b/modules/node/node.install @@ -447,17 +447,23 @@ function node_install() { * Implements hook_update_dependencies(). */ function node_update_dependencies() { - // Node update 7006 migrates node data to fields and therefore must run after - // the Field module has been enabled, but before upgrading field data. + // node_update_7006() migrates node data to fields and therefore must run + // after all Field modules have been enabled, which happens in + // system_update_7027(). It also needs to query the {filter_format} table to + // get a list of existing text formats, so it must run after + // filter_update_7000(), which creates that table. $dependencies['node'][7006] = array( - 'system' => 7049, - // It must also run after filter_update_7000() because it needs to query - // the list of existing text formats. + 'system' => 7027, 'filter' => 7000, ); - $dependencies['system'][7050] = array( - 'node' => 7006, + + // node_update_7008() migrates role permissions and therefore must run after + // the {role} and {role_permission} tables are properly set up, which happens + // in user_update_7007(). + $dependencies['node'][7008] = array( + 'user' => 7007, ); + return $dependencies; } |