Dropped 'cancelable' and queue type 'rollback'

diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
index 8a508c7f6d407c629a9b8729d5289e6d7d484c11..58d85dddceb13a4f139874239b50dcd9996abb75 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
@@ -72,8 +72,7 @@ class UninstallPackageAction extends InstallPackageAction {
                        'userID' => WCF::getUser()->userID,
                        'packageName' => $package->getName(),
                        'packageID' => $package->packageID,
-                       'action' => 'uninstall',
-                       'cancelable' => 0
+                       'action' => 'uninstall'
                ));
                        
                // initialize uninstallation

diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
index 58ee68ded47d56b2d641d2200e224571bbf5ea04..1d00d7a3c42863332445022809b97db1c5bea0a1 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
@@ -220,8 +220,7 @@ class PackageStartInstallForm extends ACPForm {
                        'packageID' => $packageID,
                        'archive' => (!empty($this->uploadPackage['tmp_name']) ? $this->uploadPackage['name'] : $this->downloadPackage),
                        'action' => ($this->package != null ? 'update' : 'install'),
-                       'confirmInstallation' => 1,
-                       'cancelable' => ($this->package != null ? 0 : 1)
+                       'confirmInstallation' => 1
                ));
                
                $this->saved();

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 510c82f26cefdbae9933d9464400788dd7454b60..218c6a056f5628a21e9642d48e175700708d8955 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -374,8 +374,7 @@ CREATE TABLE wcf1_package_installation_queue (
        packageName VARCHAR(255) NOT NULL DEFAULT '',
        packageID INT(10),
        archive VARCHAR(255) NOT NULL DEFAULT '',
-       action ENUM('install', 'update', 'uninstall', 'rollback') NOT NULL DEFAULT 'install',
-       cancelable TINYINT(1) NOT NULL DEFAULT 1,
+       action ENUM('install', 'update', 'uninstall') NOT NULL DEFAULT 'install',
        done TINYINT(1) NOT NULL DEFAULT 0,
        confirmInstallation TINYINT(1) NOT NULL DEFAULT 0,
        packageType ENUM('default', 'requirement', 'optional') NOT NULL DEFAULT 'default'