Preparing internal release 2.0.12

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1ef5873b5163d0ced6e122600f707b23f99a6578..26ae03678c6693c9509a5184cac090d4e15568a0 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.0.11 pl 1</version> <!-- codename: maelstrom -->
-               <date>2015-02-26</date>
+               <version>2.0.12</version> <!-- codename: maelstrom -->
+               <date>2015-03-09</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,7 +43,15 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
+       <!-- Heads up! Keep the two update blocks below in sync! -->
+       
        <instructions type="update" fromversion="2.0.11">
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+       </instructions>
+       
+       <instructions type="update" fromversion="2.0.11 pl 1">
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 69cb38facb830d3b9bfd6b0ee509479ecfbc0007..39d795eb1dd91aa977a15020b3dcd97014641128 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.0.11 pl 1 (Maelstrom)');
+define('WCF_VERSION', '2.0.12 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());