From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 3 Mar 2016 12:28:02 +0000 (+0100)
Subject: Preparing release 2.1.10
X-Git-Tag: 2.1.10~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7552a908f73b0ad5ee9a94b64a3d333f478729b5;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 2.1.10
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1f3b43cb15..10a0b7b8de 100644
--- 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.9 pl 1</version> <!-- codename: typhoon -->
-		<date>2015-12-23</date>
+		<version>2.1.10</version> <!-- codename: typhoon -->
+		<date>2016-03-03</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -89,7 +89,17 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
+	<!-- Heads up! Keep both update blocks below in sync! -->
 	<instructions type="update" fromversion="2.1.9">
 		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
+		<instruction type="language">language/*.xml</instruction>
+	</instructions>
+	<instructions type="update" fromversion="2.1.9 pl 1">
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
+		<instruction type="language">language/*.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 55eaefbeb0..2fb013c396 100644
--- 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.9 pl 1 (Typhoon)');
+define('WCF_VERSION', '2.1.10 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
@@ -53,7 +53,7 @@ if (!defined('NO_IMPORTS')) {
  * It holds the database connection, access to template and language engine.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2015 WoltLab GmbH
+ * @copyright	2001-2016 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	system
diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl
index a6e00a9d50..a2e06a5706 100644
--- a/wcfsetup/setup/template/footer.tpl
+++ b/wcfsetup/setup/template/footer.tpl
@@ -11,7 +11,7 @@
 		</nav>
 		
 		<div class="footerContent">
-			<address class="copyright marginTop"><a href="http://www.woltlab.com">Copyright &copy; 2001-2015 WoltLab&reg; GmbH</a></address>
+			<address class="copyright marginTop"><a href="http://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a></address>
 		</div>
 	</footer>