From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 20 Dec 2016 15:03:45 +0000 (+0100)
Subject: Preparing release 3.0.0 RC 2
X-Git-Tag: 3.0.0_RC_2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=08c321e03d68ee6250dc2f73e5b941d3f6e97cbe;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 3.0.0 RC 2
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1b5b5ff1ed..ea905eb967 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.0.0 RC 1</version> <!-- codename: vortex -->
-		<date>2016-12-15</date>
+		<version>3.0.0 RC 2</version> <!-- codename: vortex -->
+		<date>2016-12-20</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -88,21 +88,16 @@
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="3.0.0 Beta 5">
+	<instructions type="update" fromversion="3.0.0 RC 1">
 		<instruction type="file">files_update.tar</instruction>
-		
-		<instruction type="sql">update_3.0.0_rc_1.sql</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_3.0.0_rc_1.php</instruction>
+		<instruction type="sql">update_3.0.0_rc_2.sql</instruction>
 		
 		<!-- !!! whichever instruction comes next: run="standalone" !!! -->
 		
 		<instruction type="language" run="standalone">language/*.xml</instruction>
 		
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		
-		<instruction type="menu" />
-		<instruction type="option" />
-		<instruction type="userOption" />
+		<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 a74ec00388..1c9b617b3f 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.0 RC 1');
+define('WCF_VERSION', '3.0.0 RC 2');
 
 // define current unix timestamp
 define('TIME_NOW', time());