From 541e6d31af2b047e489a7952cc916e03a25126a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Fri, 21 Nov 2014 16:04:23 +0000
Subject: [PATCH] oEmbed: Add support for the Vine endpoint.

props niallkennedy.
fixes #30426.

Built from https://develop.svn.wordpress.org/trunk@30503


git-svn-id: http://core.svn.wordpress.org/trunk@30492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-oembed.php | 3 +++
 wp-includes/version.php      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 5131f89b70..c70c76da5e 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -51,6 +51,7 @@ class WP_oEmbed {
 			'#https?://poll\.fm/.*#i'                             => array( 'https://polldaddy.com/oembed/',                      true  ),
 			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array( 'http://www.funnyordie.com/oembed',                   true  ),
 			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://api.twitter.com/1/statuses/oembed.{format}', true  ),
+			'#https?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                    true  ),
  			'#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                       true  ),
 			'#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',            true  ),
 			'#http://instagr(\.am|am\.com)/p/.*#i'                => array( 'http://api.instagram.com/oembed',                    true  ),
@@ -133,6 +134,8 @@ class WP_oEmbed {
 		 * | TED          | ted.com              |  Yes  | 4.0.0     |
 		 * | YouTube      | youtube.com/playlist |  Yes  | 4.0.0     |
 		 * | ------------ | -------------------- | ----- | --------- |
+		 * | Vine         | vine.co              |  Yes  | 4.1.0     |
+		 * | ------------ | -------------------- | ----- | --------- |
 		 *
 		 * No longer supported providers:
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6c95846297..ba761cae43 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30502';
+$wp_version = '4.1-beta2-30503';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.