Some smaller adjustments

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 50d264fc732ecc9aecb42149750bbb07e371c298..f7ef2b9720e347aaff2b82718147740d7f04eac0 100644 (file)
--- 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 a8fe0f6672c7d3bbd29b06410d16115e52b62bc8..e37c9538083c1fd3ddaa11ed4ef70357b315abee 100644 (file)
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 b7dedd089541ae2f7354d8fbc81a337db6e64ea6..9acde0309b0d2307674bd0491c717856833eb274 100644 (file)
--- 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 {