From 9f6aecc26f4f2a80bec3c80e3473ac0700a568fd Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 20 May 2013 10:50:34 +0200 Subject: [PATCH] Removes unused code --- .../package/PackageInstallationDispatcher.class.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php index 8dc5c06f2d..a142cbc5b1 100644 --- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php @@ -280,9 +280,6 @@ class PackageInstallationDispatcher { } } - // if package is plugin to com.woltlab.wcf it must not have any other requirement - $requirements = $this->getArchive()->getRequirements(); - // insert requirements and dependencies $requirements = $this->getArchive()->getAllExistingRequirements(); if (!empty($requirements)) { @@ -290,7 +287,7 @@ class PackageInstallationDispatcher { (packageID, requirement) VALUES (?, ?)"; $statement = WCF::getDB()->prepareStatement($sql); - + foreach ($requirements as $identifier => $possibleRequirements) { if (count($possibleRequirements) == 1) { $requirement = array_shift($possibleRequirements); @@ -298,11 +295,10 @@ class PackageInstallationDispatcher { else { $requirement = $possibleRequirements[$this->selectedRequirements[$identifier]]; } - + $statement->execute(array($this->queue->packageID, $requirement['packageID'])); } } - } else { // create package entry @@ -326,9 +322,6 @@ class PackageInstallationDispatcher { } } - // if package is plugin to com.woltlab.wcf it must not have any other requirement - $requirements = $this->getArchive()->getRequirements(); - // insert requirements and dependencies $requirements = $this->getArchive()->getAllExistingRequirements(); if (!empty($requirements)) { -- 2.20.1