From f13d2ad1f8e7d1a2c8495b865a6a0371ad96709d Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <ryan.kienstra@xwp.co>
Date: Thu, 15 Feb 2018 12:11:39 -0600
Subject: [PATCH] Issue #841: Improve the PLAYLIST_REGEX.

Props @westonruter for the new regex.
Also, remove periods from '@return void.'
---
 includes/embeds/class-amp-playlist-embed-handler.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/embeds/class-amp-playlist-embed-handler.php b/includes/embeds/class-amp-playlist-embed-handler.php
index 21b84aabcdd..9a9fd55c916 100644
--- a/includes/embeds/class-amp-playlist-embed-handler.php
+++ b/includes/embeds/class-amp-playlist-embed-handler.php
@@ -44,7 +44,7 @@ class AMP_Playlist_Embed_Handler extends AMP_Base_Embed_Handler {
 	 *
 	 * @var string.
 	 */
-	const PLAYLIST_REGEX = '/(?s)\<script [^>]* class="wp-playlist-script"\>[^<]*?(.*).*?\<\/script\>/';
+	const PLAYLIST_REGEX = ':<script type="application/json" class="wp-playlist-script">(.+?)</script>:s';
 
 	/**
 	 * The ID of individual playlist.
@@ -71,7 +71,7 @@ public function register_embed() {
 	/**
 	 * Unregisters the playlist shortcode.
 	 *
-	 * @return void.
+	 * @return void
 	 */
 	public function unregister_embed() {
 		remove_shortcode( self::SHORTCODE );
@@ -80,7 +80,7 @@ public function unregister_embed() {
 	/**
 	 * Enqueues the playlist styling.
 	 *
-	 * @return void.
+	 * @return void
 	 */
 	public function styling() {
 		global $post;
@@ -241,7 +241,7 @@ public function get_thumb_dimensions( $track ) {
 	 *
 	 * @param string $type         The type of tracks: 'audio' or 'video'.
 	 * @param string $container_id The ID of the container.
-	 * @return void.
+	 * @return void
 	 */
 	public function tracks( $type, $container_id ) {
 		?>