summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-20 16:43:28 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-20 16:43:28 +0000
commitb9c4901d86955b8187d4fe90f15cd183ef97cff1 (patch)
treeaa488c93596f03594b025ace87788bd51cae7e9c /modules
parent45785f9610a97000bdc9b4c4fab82acd0c9789d4 (diff)
downloadbrdo-b9c4901d86955b8187d4fe90f15cd183ef97cff1.tar.gz
brdo-b9c4901d86955b8187d4fe90f15cd183ef97cff1.tar.bz2
#59479, Install system can cause module code to run before install hook is run, patch by JonBob
Diffstat (limited to 'modules')
-rw-r--r--modules/system.module3
-rw-r--r--modules/system/system.module3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/system.module b/modules/system.module
index 3e4c098de..edb0a7fb9 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
}
module_list(TRUE, FALSE);
- menu_rebuild();
include './includes/install.inc';
foreach ($new_modules as $module) {
@@ -1018,6 +1017,8 @@ function system_modules_submit($form_id, $edit) {
}
}
+ menu_rebuild();
+
drupal_set_message(t('The configuration options have been saved.'));
return 'admin/modules';
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 3e4c098de..edb0a7fb9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1006,7 +1006,6 @@ function system_modules_submit($form_id, $edit) {
}
module_list(TRUE, FALSE);
- menu_rebuild();
include './includes/install.inc';
foreach ($new_modules as $module) {
@@ -1018,6 +1017,8 @@ function system_modules_submit($form_id, $edit) {
}
}
+ menu_rebuild();
+
drupal_set_message(t('The configuration options have been saved.'));
return 'admin/modules';
}