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

index 8dc5c06f2db86f7e707d523a928d352821ca2e18..a142cbc5b1d0843a80e6eb2e5e9121704345cdb7 100644 (file)
@@ -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)) {