From 7006b0f6eede5765997663ab563f2f8ac715ff0b Mon Sep 17 00:00:00 2001 From: Travis Carden Date: Mon, 2 Jul 2012 15:07:48 -0500 Subject: [PATCH] Issue #1651190 by TravisCarden: Fixed Playlist embeds still broken. --- providers/emvideo/youtube.inc | 1 + themes/media_youtube.theme.inc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/providers/emvideo/youtube.inc b/providers/emvideo/youtube.inc index 8f365b1..a231745 100644 --- a/providers/emvideo/youtube.inc +++ b/providers/emvideo/youtube.inc @@ -107,6 +107,7 @@ function emvideo_youtube_extract($video_id = '') { $playlist_regex = array( '@youtube\.com/p/([^"\& ]+)@i', // A playlist. '@youtube\.com/view_play_list\?p=([^"\& ]+)@i', // A playlist. + '@youtube\.com/playlist\?.*list=PL([^"\& ]+)@i', // A playlist. ); foreach ($playlist_regex as $regex) { if (preg_match($regex, trim($video_id), $matches)) { diff --git a/themes/media_youtube.theme.inc b/themes/media_youtube.theme.inc index b7829f4..733762e 100644 --- a/themes/media_youtube.theme.inc +++ b/themes/media_youtube.theme.inc @@ -182,12 +182,12 @@ function template_preprocess_media_youtube_flash(&$variables) { // Create a URL from our options. if ($variables['item']['data']['playlist']) { $video_id = substr($video_id, 9); - $url = check_plain("http://www.youtube.com/p/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); + $url = check_plain("http://www.youtube.com/p/$video_id"); // FLV Player doesn't support playlists, so we need to fall back. $variables['use_flv'] = FALSE; } else { - $url = check_plain("http://www.youtube.com/v/$video_id&$related$autoplay_value$colors$border$high_quality$display_info$enablejsapi$fs"); + $url = check_plain("http://www.youtube.com/v/$video_id"); } // Find the path to the JW FLV Media Player. -- 1.7.4.1