summaryrefslogtreecommitdiff
path: root/modules/system/system.admin.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-03-06 19:38:34 +0000
committerDries Buytaert <dries@buytaert.net>2010-03-06 19:38:34 +0000
commit2552f57b3f42cf752c72a8e983dcae23f21434e0 (patch)
tree9d588e7619a874a5a22a5b71a622d4a6df68dfb0 /modules/system/system.admin.inc
parent7511394e3255b92eb14669568e7ec492aeaa333f (diff)
downloadbrdo-2552f57b3f42cf752c72a8e983dcae23f21434e0.tar.gz
brdo-2552f57b3f42cf752c72a8e983dcae23f21434e0.tar.bz2
- Patch #733026 by Island Usurper: required modules are installed/enabled in the wrong order.
Diffstat (limited to 'modules/system/system.admin.inc')
-rw-r--r--modules/system/system.admin.inc8
1 files changed, 4 insertions, 4 deletions
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);
}