Preparing internal release 2.1.0 RC 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c4c11b0d64827a7b9e9dc07460634d127a51e2b4..d04f2b839873b9e6278d92aa6309ff99aeca09ed 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -6,7 +6,7 @@
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
                <version>2.1.0 RC 2</version> <!-- codename: typhoon -->
-               <date>2015-02-16</date>
+               <date>2015-02-21</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,7 +43,7 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.0.10 pl 2">
+       <instructions type="update" fromversion="2.0.11">
                <!-- 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>
@@ -91,6 +91,13 @@
        
        <instructions type="update" fromversion="2.1.0 RC 1">
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
                <instruction type="script">acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php</instruction>
+               
+               <instruction type="option">option.xml</instruction>
+               <instruction type="userGroupOption">userGroupOption.xml</instruction>
+               
+               <instruction type="language" run="standalone">language/*.xml</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_2.1.0_rc_1.sql b/com.woltlab.wcf/update_2.1.0_rc_1.sql
deleted file mode 100644 (file)
index c23b98e..0000000
--- a/com.woltlab.wcf/update_2.1.0_rc_1.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://vimeo\\.com/(?P<ID>\\d+)', html = '<iframe src="https://player.vimeo.com/video/{$ID}" width="400" height="225" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' WHERE title = 'Vimeo';
\ No newline at end of file