summaryrefslogtreecommitdiff
path: root/modules/system/system.admin.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-16 20:08:38 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-16 20:08:38 +0000
commitf11db319d06d1d6b299e2816e6cc0bc29a7b9d73 (patch)
tree2ed6d9cecfe0d1d30e04f9a13b5fd1623caadab2 /modules/system/system.admin.inc
parent589ec7b7583c4810da9f366a80bca84bcaafe415 (diff)
downloadbrdo-f11db319d06d1d6b299e2816e6cc0bc29a7b9d73.tar.gz
brdo-f11db319d06d1d6b299e2816e6cc0bc29a7b9d73.tar.bz2
- Patch #228860 by tstoeckler, Mike Wacker, flickerfly, randallknutson, gordon: upgrading a module with a newly added dependencies breaks things badly.
Diffstat (limited to 'modules/system/system.admin.inc')
-rw-r--r--modules/system/system.admin.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index a681d74a8..4777f204f 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -914,7 +914,7 @@ function system_modules($form, $form_state = array()) {
foreach ($module->required_by as $required_by => $v) {
// Hidden modules are unset already.
if (isset($visible_files[$required_by])) {
- if ($files[$required_by]->status == 1) {
+ if ($files[$required_by]->status == 1 && $module->status == 1) {
$extra['required_by'][] = t('@module (<span class="admin-enabled">enabled</span>)', array('@module' => $files[$required_by]->info['name']));
$extra['disabled'] = TRUE;
}