From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 19 Dec 2019 19:26:08 +0000 (+0100)
Subject: Preparing the release 5.2.0 RC 2
X-Git-Tag: 5.2.0_RC_2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4c1f23d33a354bb4ed65c14e90b5c9edd193082f;p=GitHub%2FWoltLab%2FWCF.git

Preparing the release 5.2.0 RC 2
---

diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar
index dc0774f9d6..5a42367369 100644
Binary files a/com.woltlab.wcf/files_pre.tar and b/com.woltlab.wcf/files_pre.tar differ
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index be91906a81..aebb15fb27 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 1</version> <!-- codename: hurricane -->
-		<date>2019-12-12</date>
+		<version>5.2.0 RC 2</version> <!-- codename: hurricane -->
+		<date>2019-12-20</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -51,7 +51,8 @@
 	</instructions>
 	
 	<instructions type="update" fromversion="3.1.*">
-		<!-- TODO: Add a check for the minimum version and the PHP requirements! -->
+		<instruction type="file">files_preUpdate.tar</instruction>
+		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_preUpdate.php</instruction>
 		
 		<!-- Contains a few PIP-scripts, \wcf\data\option\OptionEditor, \wcf\system\cache\builder\RoutingCacheBuilder and \wcf\system\database\table\* -->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
@@ -103,13 +104,14 @@
 		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
 	</instructions>
 	
-	<!-- @TODO Add script to delete the likeable recent activities.  -->
-	<instructions type="update" fromversion="5.2.0 Beta 4">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="5.2.0 RC 1">
 		<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="language" />
 		
-		<instruction type="userOption" />
+		<instruction type="bbcode" />
 	</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
new file mode 100644
index 0000000000..cc63b5ce9f
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php
@@ -0,0 +1,30 @@
+<?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/acp/update_com.woltlab.wcf_5.2_preUpdate.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php
new file mode 100644
index 0000000000..6c3a29fbeb
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php
@@ -0,0 +1,30 @@
+<?php
+use wcf\data\package\Package;
+use wcf\system\exception\SystemException;
+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>
+ * @package	WoltLabSuite\Core
+ */
+if (Package::compareVersion(WCF_VERSION, '3.1.11', '<')) {
+	if (WCF::getLanguage()->getFixedLanguageCode() == 'de') {
+		throw new SystemException("Die Aktualisierung erfordert WoltLab Suite Core (com.woltlab.wcf) in Version 3.1.11 oder h&ouml;her.");
+	}
+	else {
+		throw new SystemException("The update requires WoltLab Suite Core (com.woltlab.wcf) in version 3.1.11 or newer.");
+	}
+}
+
+$requiredPHPVersion = '7.0.22';
+$comparePhpVersion = preg_replace('/^(\d+\.\d+\.\d+).*$/', '\\1', phpversion());
+if (version_compare($comparePhpVersion, $requiredPHPVersion) === -1) {
+	if (WCF::getLanguage()->getFixedLanguageCode() == 'de') {
+		throw new SystemException("Die Aktualisierung erfordert PHP in Version {$requiredPHPVersion} oder h&ouml;her.");
+	}
+	else {
+		throw new SystemException("The update requires PHP in version {$requiredPHPVersion} or newer.");
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 6b9d87d5c2..8bb613e1a3 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 1');
+define('WCF_VERSION', '5.2.0 RC 2');
 
 // define current API version
 // @deprecated 5.2