Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #733026 by Island Usurper: required modules are installed/enabled in the wrong order.

merge-requests/26/head
Dries Buytaert 2010-03-06 19:38:34 +00:00
parent 7511394e32
commit 2552f57b3f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/system.admin.inc
View File

@ -1205,7 +1205,7 @@ function system_modules_submit($form, &$form_state) {
foreach ($modules_to_be_enabled as $module) { foreach ($modules_to_be_enabled as $module) {
$sort[$module] = $files[$module]->sort; $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); module_enable($modules_to_be_enabled, FALSE);
} }
// Disable the modules that need disabling. // Disable the modules that need disabling.
@ -1214,8 +1214,8 @@ function system_modules_submit($form, &$form_state) {
foreach ($disable_modules as $module) { foreach ($disable_modules as $module) {
$sort[$module] = $files[$module]->sort; $sort[$module] = $files[$module]->sort;
} }
array_multisort($sort, $disable_modules); array_multisort($sort, SORT_ASC, $disable_modules);
module_disable($disable_modules); module_disable($disable_modules, FALSE);
} }
// Install new modules. // Install new modules.
@ -1227,7 +1227,7 @@ function system_modules_submit($form, &$form_state) {
} }
$sort[$module] = $files[$module]->sort; $sort[$module] = $files[$module]->sort;
} }
array_multisort($sort, $new_modules); array_multisort($sort, SORT_DESC, $new_modules);
module_enable($new_modules, FALSE); module_enable($new_modules, FALSE);
} }