Remove obsolete wcf1_package_update_version.isCritical

diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php
index 8d6e5d103b0bceb9e0ac12dabd51c38241188845..ccd115a322d98ab2c50641b5bf0067f95e65bc9d 100644 (file)
--- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php
@@ -18,7 +18,6 @@ use wcf\data\DatabaseObject;
  * @property-read      string          $license
  * @property-read      string          $licenseURL
  * @property-read      integer         $isAccessible
- * @property-read      integer         $isCritical
  */
 class PackageUpdateVersion extends DatabaseObject {
        /**

diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index c3ebaaa378a3fff0893e35d2f98d905e7caf8067..42e8042e2646d376d730c8027b78ba620d577442 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -271,8 +271,7 @@ class PackageUpdateDispatcher extends SingletonFactory {
                foreach ($elements as $element) {
                        $versionNo = $element->getAttribute('name');
                        $packageInfo['versions'][$versionNo] = [
-                               'isAccessible' => ($element->getAttribute('accessible') == 'true' ? true : false),
-                               'isCritical' => ($element->getAttribute('critical') == 'true' ? true : false)
+                               'isAccessible' => ($element->getAttribute('accessible') == 'true' ? true : false)
                        ];
                        
                        $children = $xpath->query('child::*', $element);
@@ -379,7 +378,6 @@ class PackageUpdateDispatcher extends SingletonFactory {
                                                'license' => (isset($versionData['license']['license']) ? $versionData['license']['license'] : ''),
                                                'licenseURL' => (isset($versionData['license']['license']) ? $versionData['license']['licenseURL'] : ''),
                                                'isAccessible' => ($versionData['isAccessible'] ? 1 : 0),
-                                               'isCritical' => ($versionData['isCritical'] ? 1 : 0),
                                                'packageDate' => $versionData['packageDate'],
                                                'packageUpdateID' => $packageUpdateID,
                                                'packageVersion' => $packageVersion
@@ -534,7 +532,7 @@ class PackageUpdateDispatcher extends SingletonFactory {
                $conditions->add("package IN (SELECT DISTINCT package FROM wcf".WCF_N."_package)");
                
                $sql = "SELECT          pu.packageUpdateID, pu.packageUpdateServerID, pu.package,
-                                       puv.packageUpdateVersionID, puv.isCritical, puv.packageDate, puv.filename, puv.packageVersion
+                                       puv.packageUpdateVersionID, puv.packageDate, puv.filename, puv.packageVersion
                        FROM            wcf".WCF_N."_package_update pu
                        LEFT JOIN       wcf".WCF_N."_package_update_version puv
                        ON              (puv.packageUpdateID = pu.packageUpdateID AND puv.isAccessible = 1)
@@ -554,7 +552,6 @@ class PackageUpdateDispatcher extends SingletonFactory {
                                        // version data
                                        if (!isset($updates[$existingVersion['packageID']]['versions'][$row['packageVersion']])) {
                                                $updates[$existingVersion['packageID']]['versions'][$row['packageVersion']] = [
-                                                       'isCritical' => $row['isCritical'],
                                                        'packageDate' => $row['packageDate'],
                                                        'packageVersion' => $row['packageVersion'],
                                                        'servers' => []

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 133029dc3e7a7bad71d9833918efa84298d51e3b..926a98a0fdb5ba006595bdee60419c107bd5d88e 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -942,7 +942,6 @@ CREATE TABLE wcf1_package_update_version (
        license VARCHAR(255) NOT NULL DEFAULT '',
        licenseURL VARCHAR(255) NOT NULL DEFAULT '',
        isAccessible TINYINT(1) NOT NULL DEFAULT 1,
-       isCritical TINYINT(1) NOT NULL DEFAULT 0,
        UNIQUE KEY packageUpdateID (packageUpdateID, packageVersion)
 );