#59479, Install system can cause module code to run before install hook is run, patch by JonBob

b9c4901d · Gerhard Killesreiter · 45785f96 · b9c4901d · b9c4901d
Commit b9c4901d authored Apr 20, 2006 by Gerhard Killesreiter
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

modules/system.module modules/system.module +2 -1

modules/system/system.module modules/system/system.module +2 -1

No files found.
--- 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';
 }

--- 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';
 }