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 59391c9064ed3d20cc6dc5d49e95f68758bf563c..c75934903c1d8ca20537763ab24eaa2e770a039d 100644 (file)
--- 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,