#97271 by Jaza. Ensure that hooks are not invoked for newly-disabled modules.

2 files changed, 6 insertions, 2 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index 9bb327b5e..7444b4893 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3329,7 +3329,7 @@ function system_update_1010() {
 
   // Disable urlfilter.module, if it exists.
   if (module_exists('urlfilter')) {
-    module_disable('urlfilter');
+    module_disable(array('urlfilter'));
     $ret[] = update_sql("UPDATE {filter_formats} SET module = 'filter', delta = 3 WHERE module = 'urlfilter'");
     $ret[] = t('URL Filter module was disabled; this functionality has now been added to core.');
   }
diff --git a/modules/system/system.module b/modules/system/system.module
index d4d2df881..be8127273 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1435,6 +1435,7 @@ function system_modules_submit($form_id, $form_values) {
   }
 
   $enable_modules = array();
+  $disable_modules = array();
   foreach ($form_values['status'] as $key => $choice) {
     if ($choice) {
       if (drupal_get_installed_schema_version($key) == SCHEMA_UNINSTALLED) {
@@ -1445,13 +1446,16 @@ function system_modules_submit($form_id, $form_values) {
       }
     }
     else {
-      module_disable($key);
+      $disable_modules[] = $key;
     }
   }
 
   if (!empty($enable_modules)) {
     module_enable($enable_modules);
   }
+  if (!empty($disable_modules)) {
+    module_disable($disable_modules);
+  }
 
   $old_module_list = module_list();