From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 20 May 2013 08:50:50 +0000 (+0200)
Subject: Fixes PackageArchive::getConflictedExcludedPackages()
X-Git-Tag: 2.0.0_Beta_1~138^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=89b98373d81f4232b98ca1c6a282dc1b8770075d;p=GitHub%2FWoltLab%2FWCF.git

Fixes PackageArchive::getConflictedExcludedPackages()
---

diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
index c0c674f59a..639c1f829b 100644
--- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
@@ -783,8 +783,13 @@ class PackageArchive {
 	public function getConflictedExcludedPackages() {
 		$conflictedPackages = array();
 		if (!empty($this->excludedPackages)) {
+			$excludedPackages = array();
+			foreach ($this->excludedPackages as $excludedPackageData) {
+				$excludedPackages[] = $excludedPackageData['name'];
+			}
+			
 			$conditions = new PreparedStatementConditionBuilder();
-			$conditions->add("package IN (?)", array(array_keys($this->excludedPackages)));
+			$conditions->add("package IN (?)", array($excludedPackages));
 			
 			$sql = "SELECT	*
 				FROM	wcf".WCF_N."_package