From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 7 May 2014 00:16:26 +0000 (+0200)
Subject: Fix for optional packages disregarding excluded packages
X-Git-Tag: 2.1.0_Alpha_1~842
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bce744662d3e92cbe8a698ca7ab509c493d74e67;p=GitHub%2FWoltLab%2FWCF.git

Fix for optional packages disregarding excluded packages
---

diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
index 59391c9064..c75934903c 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
@@ -669,6 +669,17 @@ class PackageInstallationNodeBuilder {
 				}
 			}
 			
+			// check for exclusions
+			$excludedPackages = $archive->getConflictedExcludedPackages();
+			if (!empty($excludedPackages)) {
+				$isInstallable = false;
+			}
+			
+			$excludingPackages = $archive->getConflictedExcludingPackages();
+			if (!empty($excludingPackages)) {
+				$isInstallable = false;
+			}
+			
 			$packages[] = array(
 				'archive' => $fileName,
 				'isInstallable' => $isInstallable,