Preparing the release 3.0.15

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 224dc6fefe376279a42d5cc2520be8a7cc9e6289..f34cee1517ec9e736df18e48f8610353214af6ce 100644 (file)
--- 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.14 pl 2</version> <!-- codename: vortex -->
-               <date>2018-04-21</date>
+               <version>3.0.15</version> <!-- codename: vortex -->
+               <date>2018-05-22</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,7 +43,7 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.21">
+       <instructions type="update" fromversion="2.1.22">
                <instruction type="file">files_pre_update.tar</instruction>
                <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
                <instruction type="sql">update_part1.sql</instruction>
@@ -91,56 +91,32 @@
                
                <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
        </instructions>
-       <instructions type="update" fromversion="2.1.21 pl 1">
-               <instruction type="file">files_pre_update.tar</instruction>
-               <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
-               <instruction type="sql">update_part1.sql</instruction>
-               
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
-               
-               <instruction type="file">files.tar</instruction>
-               <instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
-               
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
-               <instruction type="sql" run="standalone">update_1.sql</instruction>
-               <instruction type="sql" run="standalone">update_2.sql</instruction>
-               <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
-               <instruction type="sql" run="standalone">update_3.sql</instruction>
-               <instruction type="sql" run="standalone">update_4.sql</instruction>
-               <instruction type="sql" run="standalone">update_5.sql</instruction>
-               
-               <instruction type="acpTemplate">acptemplates.tar</instruction>
-               <instruction type="template">templates.tar</instruction>
-               <instruction type="language" run="standalone">language/*.xml</instruction>
+       
+       <instructions type="update" fromversion="3.0.14">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
-               <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
-               <instruction type="objectType">objectType.xml</instruction>
-               <instruction type="aclOption">aclOption.xml</instruction>
-               <instruction type="acpMenu">acpMenu.xml</instruction>
-               <instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
-               <instruction type="bbcode">bbcode.xml</instruction>
-               <instruction type="clipboardAction">clipboardAction.xml</instruction>
-               <instruction type="coreObject">coreObject.xml</instruction>
-               <instruction type="cronjob">cronjob.xml</instruction>
-               <instruction type="eventListener">eventListener.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="smiley">smiley.xml</instruction>
-               <instruction type="userGroupOption">userGroupOption.xml</instruction>
-               <instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
-               <instruction type="userOption">userOption.xml</instruction>
+               <instruction type="language" />
                
-               <instruction type="page">page.xml</instruction>
-               <instruction type="menu">menu.xml</instruction>
-               <instruction type="menuItem">menuItem.xml</instruction>
-               <instruction type="box">box.xml</instruction>
+               <instruction type="acpMenu" />
+       </instructions>
+       <instructions type="update" fromversion="3.0.14 pl 1">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="style">defaultStyle.tar</instruction>
+               <instruction type="language" />
                
-               <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
+               <instruction type="acpMenu" />
        </instructions>
-       
-       <instructions type="update" fromversion="3.0.14 pl 1">
+       <instructions type="update" fromversion="3.0.14 pl 2">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
+               <instruction type="language" />
+               
+               <instruction type="acpMenu" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 03e77ae88f3626e4592742e09ac651087ef3cfc6..e43af2152aec0f24518f7faf77b2ccdf0f74b8b1 100644 (file)
--- 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.14 pl 2');
+define('WCF_VERSION', '3.0.15');
 
 // define current unix timestamp
 define('TIME_NOW', time());