From 7eb0253744133891d1c51620da37d04466c8fad7 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 27 May 2014 18:42:30 +0000 Subject: [PATCH] For YouTube playlist oEmbed, we need keep BC for `wp_oembed_remove_provider()` by not changing the existing YouTube endpoint keys. So, rather than merging the rules, the playlist endpoints should be on their own line. Props kovshenin. See #28125, [28552]. git-svn-id: https://develop.svn.wordpress.org/trunk@28593 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-oembed.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/class-oembed.php b/src/wp-includes/class-oembed.php index 1b01119ee2..618cdba4fe 100644 --- a/src/wp-includes/class-oembed.php +++ b/src/wp-includes/class-oembed.php @@ -27,8 +27,10 @@ class WP_oEmbed { */ public function __construct() { $providers = array( - '#http://(www\.)?youtube\.com/(watch|playlist).*#i' => array( 'http://www.youtube.com/oembed', true ), - '#https://(www\.)?youtube\.com/(watch|playlist).*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), + '#http://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ), + '#https://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), + '#http://(www\.)?youtube\.com/playlist.*#i' => array( 'http://www.youtube.com/oembed', true ), + '#https://(www\.)?youtube\.com/playlist.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), '#http://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed', true ), '#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), 'http://blip.tv/*' => array( 'http://blip.tv/oembed/', false ),