Preparing release 2.1.11

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 3feb62d0d783d92f96cc9e105fdb3405dd80c1a8..7be1e58b973dfec2b214f063085750b50b149e7c 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.1.10</version> <!-- codename: typhoon -->
-               <date>2016-03-13</date>
+               <version>2.1.11</version> <!-- codename: typhoon -->
+               <date>2016-05-26</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,17 +89,15 @@
                <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">
+       <instructions type="update" fromversion="2.1.10">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <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="sql" run="standalone">update_2.1.11.sql</instruction>
                
-               <instruction type="language">language/*.xml</instruction>
+               <instruction type="language" run="standalone">language/*.xml</instruction>
+               
+               <instruction type="bbcode">bbcode.xml</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_2.1.11.sql b/com.woltlab.wcf/update_2.1.11.sql
new file mode 100644 (file)
index 0000000..387e522
--- /dev/null
+++ b/com.woltlab.wcf/update_2.1.11.sql
@@ -0,0 +1,8 @@
+/* e80b96ef0f3490b7edccf7209424f245705f5c91 */
+ALTER TABLE wcf1_user ADD KEY authData (authData);
+
+/* 66f046bb344ff7903bb767b5982fe77758960919 */
+UPDATE  wcf1_bbcode_media_provider
+SET     regex = 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/(?:#/)?watch\\?(?:.*?&)?v=)(?P<ID>[a-zA-Z0-9_-]+)(?:(?:\\?|&)t=(?P<start>\\d+)$)?',
+       html ='<iframe style="max-width:100%;" width="560" height="315" src="https://www.youtube.com/embed/{$ID}?wmode=transparent&amp;start={$start}" allowfullscreen></iframe>'
+WHERE   title = 'YouTube';

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 2fb013c396318b5baa762431b293b97580dd73bf..a5a3cd9edc0a78a0263a8c94ed19b16af9adb386 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.1.10 (Typhoon)');
+define('WCF_VERSION', '2.1.11 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());