Release 5.2.6

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index b16f04a9ba23274efcbeeb8e7bd7ab029f9e8263..fce3cfefebff193e45b5310bf0fb09d60422a677 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -6,7 +6,7 @@
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
                <version>5.2.6</version> <!-- codename: hurricane -->
-               <date>2020-04-08</date>
+               <date>2020-05-10</date>
        </packageinformation>
        
        <authorinformation>
@@ -109,6 +109,8 @@
        </instructions>
        
        <instructions type="update" fromversion="5.2.5">
+               <instruction type="script">acp/update_com.woltlab.wcf_5.2.6.php</instruction>
+               
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.14.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.14.php
deleted file mode 100644 (file)
index bbc79ef..0000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1.14.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-use wcf\system\WCF;
-
-if (WCF::getUser()->logToken !== null) {
-       $candidates = [
-               WCF_DIR . 'lib/data/user/User.class.php',
-               WCF_DIR . 'lib/system/request/RequestHandler.class.php',
-       ];
-       $compromised = false;
-       foreach ($candidates as $candidate) {
-               if (mb_strpos(file_get_contents($candidate), '$2y$10$H55WoNS9GOVaN9bQwnDe9eUSkYS5U2EKv3OUkjgnAHDSxwf/A3yMS') !== false) {
-                       $compromised = true;
-                       break;
-               }
-       }
-       
-       if ($compromised) {
-               $sql = "UPDATE  wcf" . WCF_N . "_user
-                       SET     logToken = ?
-                       WHERE   logToken <> ?";
-               $statement = WCF::getDB()->prepareStatement($sql);
-               $statement->execute([
-                       'compromised',
-                       '',
-               ]);
-       }
-}

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.6.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.6.php
new file mode 100644 (file)
index 0000000..bbc79ef
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.6.php
@@ -0,0 +1,27 @@
+<?php
+use wcf\system\WCF;
+
+if (WCF::getUser()->logToken !== null) {
+       $candidates = [
+               WCF_DIR . 'lib/data/user/User.class.php',
+               WCF_DIR . 'lib/system/request/RequestHandler.class.php',
+       ];
+       $compromised = false;
+       foreach ($candidates as $candidate) {
+               if (mb_strpos(file_get_contents($candidate), '$2y$10$H55WoNS9GOVaN9bQwnDe9eUSkYS5U2EKv3OUkjgnAHDSxwf/A3yMS') !== false) {
+                       $compromised = true;
+                       break;
+               }
+       }
+       
+       if ($compromised) {
+               $sql = "UPDATE  wcf" . WCF_N . "_user
+                       SET     logToken = ?
+                       WHERE   logToken <> ?";
+               $statement = WCF::getDB()->prepareStatement($sql);
+               $statement->execute([
+                       'compromised',
+                       '',
+               ]);
+       }
+}