From 050008410d34a78d93cac155476d359669a3cad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Thu, 13 Dec 2007 10:46:43 +0000
Subject: #194010 by chx: Proper recursive dependency checking and ordering
 module installation in dependency order, so later installed modules can use
 previously installed module functionality

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

(limited to 'modules')

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 368056a2b..a81f36f3d 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -535,6 +535,12 @@ function system_theme_settings_submit($form, &$form_state) {
  * Recursively check compatability
  */
 function _system_is_incompatible(&$incompatible, $files, $file) {
+  static $seen;
+  // We need to protect ourselves in case of a circular dependency.
+  if (isset($seen[$file->name])) {
+    return isset($incompatible[$file->name]);
+  }
+  $seen[$file->name] = TRUE;
   if (isset($incompatible[$file->name])) {
     return TRUE;
   }
-- 
cgit v1.2.3