From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 31 Jan 2015 10:59:02 +0000 (+0100)
Subject: Some smaller adjustments
X-Git-Tag: 2.1.0_Beta_4~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa76f45130396b717763ce6ff29f8332090e3d1e;p=GitHub%2FWoltLab%2FWCF.git

Some smaller adjustments
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 50d264fc73..f7ef2b9720 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -43,7 +43,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.10">
+	<instructions type="update" fromversion="2.0.10 pl 2">
 		<!-- 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>
diff --git a/com.woltlab.wcf/pre_update_check.tar b/com.woltlab.wcf/pre_update_check.tar
index a8fe0f6672..e37c953808 100644
Binary files a/com.woltlab.wcf/pre_update_check.tar and b/com.woltlab.wcf/pre_update_check.tar differ
diff --git a/wcfsetup/install/files/acp/pre_update_com.woltlab.wcf_2.1.php b/wcfsetup/install/files/acp/pre_update_com.woltlab.wcf_2.1.php
index b7dedd0895..9acde0309b 100644
--- a/wcfsetup/install/files/acp/pre_update_com.woltlab.wcf_2.1.php
+++ b/wcfsetup/install/files/acp/pre_update_com.woltlab.wcf_2.1.php
@@ -5,7 +5,7 @@ use wcf\system\WCF;
 
 /**
  * @author	Alexander Ebert
- * @copyright	2001-2014 WoltLab GmbH
+ * @copyright	2001-2015 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @category	Community Framework
@@ -13,7 +13,6 @@ use wcf\system\WCF;
 
 if (Package::compareVersion(preg_replace('~ \(Maelstrom\)$~', '', WCF_VERSION), '2.0.10', '<')) {
 	if (WCF::getLanguage()->getFixedLanguageCode() == 'de') {
-		die("<pre>".preg_replace('~ \(Maelstrom\)$~', '', WCF_VERSION)." != 2.0.10");
 		throw new SystemException("Die Aktualisierung erfordert WoltLab Community Framework (com.woltlab.wcf) in Version 2.0.10 oder hoeher");
 	}
 	else {