From 0807a1b741f2598c54f9da6065a91f5490c5a0e1 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 30 May 2015 17:42:32 +0000
Subject: [PATCH] fixed module order if or-combined dependencies are used

---
 lam/lib/modules.inc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 55e50be8..1dd17557 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -2019,7 +2019,20 @@ class accountContainer {
 				$everything_found = true;
 				$dependencies = $dependencies['depends'];
 				for ($d = 0; $d < sizeof($dependencies); $d++) {
-					if (!in_array($dependencies[$d], $order)) {
+					if (is_array($dependencies[$d])) { // or-combined dependencies
+						$noneFound = true;
+						foreach ($dependencies[$d] as $or) {
+							if (in_array($or, $order)) {
+								$noneFound = false;
+								break;
+							}
+						}
+						if ($noneFound) {
+							$everything_found = false;
+							break;
+						}
+					}
+					elseif (!in_array($dependencies[$d], $order)) { // single dependency
 						$everything_found = false;
 						break;
 					}