Preparing release 2.1.7

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 487dc3e0a9f9cdbf8206663d51697ce25115cf45..957c58b2169ac172dc7ecd8e7cb7d90b4ef97c30 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.1.6</version> <!-- codename: typhoon -->
-               <date>2015-07-23</date>
+               <version>2.1.7</version> <!-- codename: typhoon -->
+               <date>2015-08-30</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,7 +43,7 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.0.12">
+       <instructions type="update" fromversion="2.0.13">
                <!-- pre-update check to prevent update from WCF < 2.0.10 -->
                <instruction type="file">pre_update_check.tar</instruction>
                <instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
@@ -89,57 +89,12 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.0.12 pl 1">
-               <!-- pre-update check to prevent update from WCF < 2.0.10 -->
-               <instruction type="file">pre_update_check.tar</instruction>
-               <instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
-               
-               <!-- the actual update -->
-               <instruction type="option" run="standalone">option.xml</instruction>
-               
-               <instruction type="file">files.tar</instruction>
-               <instruction type="script">acp/update_com.woltlab.wcf_2.1.php</instruction>
-               
-               <instruction type="template" run="standalone">templates.tar</instruction>
-               
-               <instruction type="acpTemplate" run="standalone">acptemplates.tar</instruction>
-               
-               <instruction type="language" run="standalone">language/*.xml</instruction>
-               
-               <instruction type="sql" run="standalone">update_210.sql</instruction>
-               
-               <instruction type="sql" run="standalone">update_user1_210.sql</instruction>
-               <instruction type="sql" run="standalone">update_user2_210.sql</instruction>
-               <instruction type="sql" run="standalone">update_user3_210.sql</instruction>
-               <instruction type="sql" run="standalone">update_user4_210.sql</instruction>
-               <instruction type="sql" run="standalone">update_user5_210.sql</instruction>
-               
-               <instruction type="acpMenu">acpMenu.xml</instruction>
-               <instruction type="bbcode">bbcode.xml</instruction>
-               <instruction type="style">blue-temptation-style.tgz</instruction>
-               <instruction type="clipboardAction">clipboardAction.xml</instruction>
-               <instruction type="coreObject">coreObject.xml</instruction>
-               <instruction type="cronjob">cronjob_update210.xml</instruction>
-               <instruction type="dashboardBox">dashboardBox.xml</instruction>
-               <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
-               <instruction type="objectType">objectType.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="pageMenu">pageMenu.xml</instruction>
-               <instruction type="userGroupOption">userGroupOption.xml</instruction>
-               <instruction type="userMenu">userMenu.xml</instruction>
-               <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
-               <instruction type="userOption">userOption.xml</instruction>
-               <instruction type="userProfileMenu">userProfileMenu.xml</instruction>
-               
-               <instruction type="script" run="standalone">acp/update_mqc_com.woltlab.wcf_2.1.php</instruction>
-               <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
-       </instructions>
-       
-       <instructions type="update" fromversion="2.1.5">
+       <instructions type="update" fromversion="2.1.6">
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" run="standalone">language/*.xml</instruction>
-               <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
+               
+               <instruction type="userGroupOption">userGroupOption.xml</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 327aa31bb31164be228f51c9356373446c72cc09..ccf4e192c99b80e08c5c525647d53dee1383fee3 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.6 (Typhoon)');
+define('WCF_VERSION', '2.1.7 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());