summaryrefslogtreecommitdiff
path: root/modules/system/system.install
diff options
context:
space:
mode:
authorwebchick <webchick@24967.no-reply.drupal.org>2011-08-06 16:29:31 -0700
committerwebchick <webchick@24967.no-reply.drupal.org>2011-08-06 16:29:31 -0700
commit1e48014398e19d334bb0b6e5ac517265b575a6f4 (patch)
tree11b0e38f2cf212ca48bfb8946c3f446abe354061 /modules/system/system.install
parent3af0b234d2d9d0be8bf578096d621a57eaf3481a (diff)
downloadbrdo-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/system/system.install')
-rw-r--r--modules/system/system.install13
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/system/system.install b/modules/system/system.install
index e55c7cf3a..6cbbb9ed0 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1681,11 +1681,19 @@ function system_update_last_removed() {
* Implements hook_update_dependencies().
*/
function system_update_dependencies() {
- // Update 7053 adds new blocks, so make sure the block tables are updated.
+ // system_update_7053() queries the {block} table, so it must run after
+ // block_update_7002(), which creates that table.
$dependencies['system'][7053] = array(
'block' => 7002,
);
+ // system_update_7067() 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['system'][7067] = array(
+ 'user' => 7007,
+ );
+
return $dependencies;
}
@@ -1866,9 +1874,6 @@ function system_update_7005() {
/**
* Convert to new method of storing permissions.
- *
- * This update is in system.install rather than user.install so that
- * all modules can use the updated permission scheme during their updates.
*/
function system_update_7007() {
// Copy the permissions from the old {permission} table to the new {role_permission} table.