From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 27 Jun 2020 09:50:30 +0000 (+0200)
Subject: Preparing the release 3.1.15
X-Git-Tag: 3.1.15~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd4d9de5fc28d17643c109fc87ae88f2d9265817;p=GitHub%2FWoltLab%2FWCF.git

Preparing the release 3.1.15
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 03e91fb6a3..fa66d785a3 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>3.1.14</version> <!-- codename: tornado -->
-		<date>2020-05-10</date>
+		<version>3.1.15</version> <!-- codename: tornado -->
+		<date>2020-06-28</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -99,16 +99,7 @@
 		<instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="3.1.13">
-		<instruction type="file">files_pre_3.1.14.tar</instruction>
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_3.1.14.php</instruction>
-		
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="3.1.14">
 		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		
-		<instruction type="language" />
-		
-		<instruction type="page" />
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 99fa3c786e..383fe441d0 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.14');
+define('WCF_VERSION', '3.1.15');
 
 // define current API version
 define('WSC_API_VERSION', 2018);