From f11db319d06d1d6b299e2816e6cc0bc29a7b9d73 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 16 May 2010 20:08:38 +0000
Subject: - Patch #228860 by tstoeckler, Mike Wacker, flickerfly,
 randallknutson, gordon: upgrading a module with a newly added dependencies
 breaks things badly.

---
 modules/system/system.admin.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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;
         }
-- 
cgit v1.2.3