summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/system/system.admin.inc6
1 files changed, 6 insertions, 0 deletions
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;
}