From 2552f57b3f42cf752c72a8e983dcae23f21434e0 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 6 Mar 2010 19:38:34 +0000
Subject: - Patch #733026 by Island Usurper: required modules are
 installed/enabled in the wrong order.

---
 modules/system/system.admin.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/system/system.admin.inc')

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 41ac3a4a0..f4bc641a0 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1205,7 +1205,7 @@ function system_modules_submit($form, &$form_state) {
     foreach ($modules_to_be_enabled as $module) {
       $sort[$module] = $files[$module]->sort;
     }
-    array_multisort($sort, $modules_to_be_enabled);
+    array_multisort($sort, SORT_DESC, $modules_to_be_enabled);
     module_enable($modules_to_be_enabled, FALSE);
   }
   // Disable the modules that need disabling.
@@ -1214,8 +1214,8 @@ function system_modules_submit($form, &$form_state) {
     foreach ($disable_modules as $module) {
       $sort[$module] = $files[$module]->sort;
     }
-    array_multisort($sort, $disable_modules);
-    module_disable($disable_modules);
+    array_multisort($sort, SORT_ASC, $disable_modules);
+    module_disable($disable_modules, FALSE);
   }
 
   // Install new modules.
@@ -1227,7 +1227,7 @@ function system_modules_submit($form, &$form_state) {
       }
       $sort[$module] = $files[$module]->sort;
     }
-    array_multisort($sort, $new_modules);
+    array_multisort($sort, SORT_DESC, $new_modules);
     module_enable($new_modules, FALSE);
   }
 
-- 
cgit v1.2.3