From 1722135715299aaed8a3036442b7b4a3d55e76ea Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 7 Dec 2012 19:32:45 +0100 Subject: [PATCH] Dropped 'cancelable' and queue type 'rollback' --- .../files/lib/acp/action/UninstallPackageAction.class.php | 3 +-- .../files/lib/acp/form/PackageStartInstallForm.class.php | 3 +-- wcfsetup/setup/db/install.sql | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php index 8a508c7f6d..58d85dddce 100644 --- 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 58ee68ded4..1d00d7a3c4 100755 --- 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 510c82f26c..218c6a056f 100644 --- 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' -- 2.20.1