From 32c31af3e7c9282a29df7f5bbc7047644072a35a Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 18 Oct 2016 12:41:14 +0200
Subject: [PATCH] Preparing release 2.1.12

---
 com.woltlab.wcf/package.xml                     | 14 +++++++-------
 com.woltlab.wcf/update_2.1.11.sql               |  8 --------
 com.woltlab.wcf/update_2.1.12.sql               |  5 +++++
 wcfsetup/install/files/lib/system/WCF.class.php |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_2.1.11.sql
 create mode 100644 com.woltlab.wcf/update_2.1.12.sql

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a887e58acf..bbd6243944 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.11</version> <!-- codename: typhoon -->
-		<date>2016-06-01</date>
+		<version>2.1.12</version> <!-- codename: typhoon -->
+		<date>2016-10-18</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,7 +43,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.13">
+	<instructions type="update" fromversion="2.0.14">
 		<!-- 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>
@@ -89,15 +89,15 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.1.10">
+	<instructions type="update" fromversion="2.1.11">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<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" run="standalone">language/*.xml</instruction>
 		
-		<instruction type="bbcode">bbcode.xml</instruction>
+		<instruction type="sql" run="standalone">update_2.1.12.sql</instruction>
+		
+		<instruction type="option">option.xml</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_2.1.11.sql b/com.woltlab.wcf/update_2.1.11.sql
deleted file mode 100644
index 387e5226d2..0000000000
--- a/com.woltlab.wcf/update_2.1.11.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-/* 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/com.woltlab.wcf/update_2.1.12.sql b/com.woltlab.wcf/update_2.1.12.sql
new file mode 100644
index 0000000000..ef3eead8f2
--- /dev/null
+++ b/com.woltlab.wcf/update_2.1.12.sql
@@ -0,0 +1,5 @@
+/* a61d3877562d5ca0e16deb73fa0eb4a2608e5d5c */
+DELETE FROM wcf1_bbcode_media_provider WHERE title = 'MyVideo';
+
+/* 6259fd829bc984d24ce74b91bae6ce546f233311 */
+ALTER TABLE wcf1_user ADD KEY email (email);
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 0f46cb70a1..98ccaf7f82 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.11 (Typhoon)');
+define('WCF_VERSION', '2.1.12 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1