From 3eb02bd8b2f803d2e38479f537304f89708fb756 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 22 Jul 2016 19:27:59 +0200
Subject: [PATCH] Added missing exclusion checks of installed packages

---
 .../update/PackageUpdateAction.class.php      | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
index c70b8952c5..7e645ae62d 100644
--- a/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
@@ -127,10 +127,13 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 		}
 		
 		// get excluded packages
+		$conditions = new PreparedStatementConditionBuilder();
+		$conditions->add("packageUpdateVersionID IN (SELECT packageUpdateVersionID FROM wcf".WCF_N."_package_update_version WHERE packageUpdateID IN (?))", [$packageUpdateIDs]);
 		$sql = "SELECT	*
-			FROM	wcf".WCF_N."_package_update_exclusion";
+			FROM	wcf".WCF_N."_package_update_exclusion
+			".$conditions;
 		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute();
+		$statement->execute($conditions->getParameters());
 		$excludedPackages = [];
 		while ($row = $statement->fetchArray()) {
 			$package = $row['excludedPackage'];
@@ -152,6 +155,21 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 		$statement->execute();
 		$installedPackages = $statement->fetchMap('package', 'packageVersion');
 		
+		// get excluded packages (of installed packages)
+		$excludedPackagesOfInstalledPackages = [];
+		$sql = "SELECT	excludedPackage, excludedPackageVersion
+			FROM	wcf".WCF_N."_package_exclusion";
+		$statement = WCF::getDB()->prepareStatement($sql);
+		$statement->execute();
+		while ($row = $statement->fetchArray()) {
+			if (!isset($excludedPackagesOfInstalledPackages[$row['excludedPackage']])) {
+				$excludedPackagesOfInstalledPackages[$row['excludedPackage']] = $row['excludedPackageVersion'];
+			}
+			else if (Package::compareVersion($excludedPackagesOfInstalledPackages[$row['excludedPackage']], $row['excludedPackageVersion'], '>')) {
+				$excludedPackagesOfInstalledPackages[$row['excludedPackage']] = $row['excludedPackageVersion'];
+			}
+		}
+		
 		// filter by version
 		$conditions = new PreparedStatementConditionBuilder();
 		$conditions->add("puv.packageUpdateID IN (?)", [$packageUpdateIDs]);
@@ -183,6 +201,12 @@ class PackageUpdateAction extends AbstractDatabaseObjectAction {
 					continue;
 				}
 			}
+			// check excluded packages of installed packages
+			if (isset($excludedPackagesOfInstalledPackages[$row['package']])) {
+				if (Package::compareVersion($packageVersion, $excludedPackagesOfInstalledPackages[$row['package']], '>=')) {
+					continue;
+				}
+			}
 			
 			if (!isset($packageVersions[$package])) {
 				$packageVersions[$package] = [];
-- 
2.20.1