From 8d2a193a6fef5cbd1566d857b443f287b5f656d0 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 4 Jun 2013 01:54:07 +0200
Subject: [PATCH] Preparing update 2.0.0 Beta 3

---
 com.woltlab.wcf/package.xml   | 14 ++++++++++++--
 com.woltlab.wcf/update_b3.sql | 13 +++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 com.woltlab.wcf/update_b3.sql

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index e5ea36d8c9..c8de663231 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.0.0 Beta 2</version> <!-- codename: maelstrom -->
-		<date>2013-06-01</date>
+		<version>2.0.0 Beta 3</version> <!-- codename: maelstrom -->
+		<date>2013-06-04</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -47,6 +47,16 @@
 		<instruction type="language">language/*.xml</instruction>
 		<instruction type="option">option.xml</instruction>
 		<instruction type="sql">update_b2.sql</instruction>
+		<instruction type="sql">update_b3.sql</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	
+	<instructions type="update" fromversion="2.0.0 Beta 2">
+		<instruction type="acpTemplate">acptemplates.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="language">language/*.xml</instruction>
+		<instruction type="option">option.xml</instruction>
+		<instruction type="sql">update_b3.sql</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_b3.sql b/com.woltlab.wcf/update_b3.sql
new file mode 100644
index 0000000000..6d0b341286
--- /dev/null
+++ b/com.woltlab.wcf/update_b3.sql
@@ -0,0 +1,13 @@
+ALTER TABLE wcf1_acp_session CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
+ALTER TABLE wcf1_acp_session_access_log CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
+ALTER TABLE wcf1_session CHANGE requestMethod requestMethod VARCHAR(7) NOT NULL DEFAULT '';
+
+UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/watch\\?(?:.*?&)?v=)(?P<ID>[a-zA-Z0-9_-]+)(?P<start>(?:#a?t=(?:\\d+|(?:\\d+h(?:\\d+m)?(?:\\d+s)?)|(?:\\d+m(?:\\d+s)?)|(?:\\d+s))$)?)' WHERE title = 'YouTube';
+UPDATE wcf1_bbcode_media_provider SET regex = 'http://vimeo\\.com/(?P<ID>\\d+)' WHERE title = 'Vimeo';
+UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?myvideo\\.de/watch/(?P<ID>\\d+)' WHERE title = 'MyVideo';
+UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?clipfish\\.de/(?:.*?/)?video/(?P<ID>\\d+)/' WHERE title = 'Clipfish';
+UPDATE wcf1_bbcode_media_provider SET regex = 'http://(?:www\\.)?veoh\\.com/watch/v(?P<ID>\\d+[a-zA-Z0-9]+)' WHERE title = 'Veoh';
+UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:www\\.)?dailymotion\\.com/video/(?P<ID>[a-zA-Z0-9]+)' WHERE title = 'DailyMotion';
+UPDATE wcf1_bbcode_media_provider SET regex = 'https?://(?:.+?\\.)?youku\\.com/v_show/id_(?P<ID>[a-zA-Z0-9_-]+)(?:\\.html)?' WHERE title = 'YouKu';
+UPDATE wcf1_bbcode_media_provider SET regex = 'https://gist.github.com/(?P<ID>[^/]+/[0-9a-zA-Z]+)' WHERE title = 'github gist';
+UPDATE wcf1_bbcode_media_provider SET regex = 'https?://soundcloud.com/(?P<artist>[a-zA-Z0-9_-]+)/(?P<song>[a-zA-Z0-9_-]+)' WHERE title = 'Soundcloud';
\ No newline at end of file
-- 
2.20.1