From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 28 Dec 2019 19:29:30 +0000 (+0100)
Subject: Preparing the release 5.2.0
X-Git-Tag: 5.2.0
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=79bce82e9ca70db1124bb6b5dcb21290b6168920;p=GitHub%2FWoltLab%2FWCF.git

Preparing the release 5.2.0
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index aebb15fb27..4c72f46917 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>5.2.0 RC 2</version> <!-- codename: hurricane -->
-		<date>2019-12-20</date>
+		<version>5.2.0</version> <!-- codename: hurricane -->
+		<date>2019-12-29</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -104,14 +104,12 @@
 		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="5.2.0 RC 1">
+	<instructions type="update" fromversion="5.2.0 RC 2">
 		<instruction type="file">files_update.tar</instruction>
-		
-		<instruction type="script">acp/update_com.woltlab.wcf_5.2.0_rc_2.php</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_5.2_deleteRecentActivity.php</instruction>
+		<instruction type="template">templates_update.tar</instruction>
 		
 		<instruction type="language" />
 		
-		<instruction type="bbcode" />
+		<instruction type="objectType" />
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php
deleted file mode 100644
index cc63b5ce9f..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-use wcf\system\database\table\column\NotNullInt10DatabaseTableColumn;
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\database\table\PartialDatabaseTable;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-use wcf\system\WCF;
-
-/**
- * @author      Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
- * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-$tables = [
-	PartialDatabaseTable::create('wcf1_media')
-		->columns([
-			// Incorrect column name in the upgrade 3.1 -> 5.2.0 RC 1
-			NotNullInt10DatabaseTableColumn::create('lastDownload')
-				->defaultValue(0)
-				->drop(),
-			NotNullInt10DatabaseTableColumn::create('lastDownloadTime')
-				->defaultValue(0)
-		]),
-];
-
-(new DatabaseTableChangeProcessor(
-	/** @var ScriptPackageInstallationPlugin $this */
-	$this->installation->getPackage(),
-	$tables,
-	WCF::getDB()->getEditor())
-)->process();
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 8bb613e1a3..893f7d3a53 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -49,7 +49,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '5.2.0 RC 2');
+define('WCF_VERSION', '5.2.0');
 
 // define current API version
 // @deprecated 5.2