From 57768cd1ce8dea7e1ef5299023e815950f6491f1 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 14 Feb 2015 00:09:02 +0100
Subject: [PATCH] Fixed update, applied changes to Vimeo

---
 com.woltlab.wcf/package.xml                         | 10 +++++++---
 com.woltlab.wcf/update_2.1.0_rc_1.sql               |  1 +
 com.woltlab.wcf/update_210.sql                      |  1 +
 .../files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php | 13 +++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 com.woltlab.wcf/update_2.1.0_rc_1.sql
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 7338797b95..6038aa5096 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -90,13 +90,17 @@
 	</instructions>
 	
 	<instructions type="update" fromversion="2.1.0 Beta 4">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="option">option.xml</instruction>
 		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
+		<instruction type="script">acp/update_com.woltlab.wcf_2.1.0_rc_1.php</instruction>
 		
 		<instruction type="language" run="standalone">language/*.xml</instruction>
 		
-		<instruction type="option">option.xml</instruction>
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
+		<instruction type="sql">update_2.1.0_rc_1.sql</instruction>
+		
 		<instruction type="userGroupOption">userGroupOption.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
new file mode 100644
index 0000000000..c23b98edb8
--- /dev/null
+++ b/com.woltlab.wcf/update_2.1.0_rc_1.sql
@@ -0,0 +1 @@
+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
diff --git a/com.woltlab.wcf/update_210.sql b/com.woltlab.wcf/update_210.sql
index cf17db4258..4cf79cfb5f 100644
--- a/com.woltlab.wcf/update_210.sql
+++ b/com.woltlab.wcf/update_210.sql
@@ -295,6 +295,7 @@ DELETE FROM wcf1_style_variable WHERE variableName = 'wcfMainMenuHoverBackground
 INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Soundcloud set', 'https?://soundcloud.com/(?P<artist>[a-zA-Z0-9_-]+)/sets/(?P<name>[a-zA-Z0-9_-]+)', '<iframe width="100%" height="450" scrolling="no" src="https://w.soundcloud.com/player/?url=http%3A%2F%2Fsoundcloud.com%2F{$artist}%2Fsets%2F{$name}"></iframe>');
 UPDATE wcf1_bbcode_media_provider SET regex = 'https?://soundcloud.com/(?P<artist>[a-zA-Z0-9_-]+)/(?!sets/)(?P<song>[a-zA-Z0-9_-]+)' WHERE title = 'Soundcloud';
 UPDATE wcf1_bbcode_media_provider SET html = '<iframe style="max-width:100%;" width="560" height="315" src="https://www.youtube-nocookie.com/embed/{$ID}?wmode=transparent{$start}" allowfullscreen></iframe>' WHERE title = 'YouTube';
+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';
 
 /* 
  * ##############################
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php
new file mode 100644
index 0000000000..737910adbd
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php
@@ -0,0 +1,13 @@
+<?php
+use wcf\data\option\OptionEditor;
+
+/**
+ * @author	Alexander Ebert
+ * @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
+ */
+
+// rebuild options during update to properly handle new option
+OptionEditor::resetCache();
-- 
2.20.1