From b9c4901d86955b8187d4fe90f15cd183ef97cff1 Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Thu, 20 Apr 2006 16:43:28 +0000
Subject: #59479, Install system can cause module code to run before install
 hook is run, patch by JonBob

---
 modules/system.module        | 3 ++-
 modules/system/system.module | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

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';
 }
-- 
cgit v1.2.3