Fixes PackageArchive::getConflictedExcludedPackages()
authorMatthias Schmidt <gravatronics@live.com>
Mon, 20 May 2013 08:50:50 +0000 (10:50 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Mon, 20 May 2013 08:50:50 +0000 (10:50 +0200)
wcfsetup/install/files/lib/system/package/PackageArchive.class.php

index c0c674f59a24b58eb2a9ade62393d822100a7a36..639c1f829b7c8cd86aca15c7bbba3754df7bd5a9 100644 (file)
@@ -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