From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 2 Jan 2013 18:04:43 +0000 (+0100)
Subject: Ignoring optionals if already installed
X-Git-Tag: 2.0.0_Beta_1~606^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=299400c556aa117fca079ade12a5c1b78a99776c;p=GitHub%2FWoltLab%2FWCF.git

Ignoring optionals if already installed

Fixes #1065
---

diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
index 80c0606403..63da8f3226 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
@@ -1,5 +1,7 @@
 <?php
 namespace wcf\system\package;
+use wcf\data\package\Package;
+
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\installation\queue\PackageInstallationQueueList;
 use wcf\system\exception\SystemException;
@@ -528,6 +530,11 @@ class PackageInstallationNodeBuilder {
 		
 		$optionalPackages = $this->installation->getArchive()->getOptionals();
 		foreach ($optionalPackages as $package) {
+			// check if already installed
+			if (Package::isAlreadyInstalled($package['name'])) {
+				continue;
+			}
+			
 			// extract package
 			$index = $this->installation->getArchive()->getTar()->getIndexByFilename($package['file']);
 			if ($index === false) {