Changeset 31574

Timestamp:

02/27/2015 04:11:00 PM (10 years ago)

Author:

wonderboymusic

Message:

Improve get_media_embedded_in_content() so that it returns the media it finds in the same order that it appears in the content.

Adds unit test, updates another.

Props kopepasah.
See #26675.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -3221 +3221 @@
 function get_media_embedded_in_content( $content, $types = null ) {
     $html = array();
-    $allowed_media_types = array( 'audio', 'video', 'object', 'embed', 'iframe' );
+
+    $allowed_media_types = apply_filters( 'get_media_embedded_in_content_allowed', array( 'audio', 'video', 'object', 'embed', 'iframe' ) );
+
     if ( ! empty( $types ) ) {
-        if ( ! is_array( $types ) )
+        if ( ! is_array( $types ) ) {
             $types = array( $types );
+        }
+
         $allowed_media_types = array_intersect( $allowed_media_types, $types );
     }
 
-    foreach ( $allowed_media_types as $tag ) {
-        if ( preg_match( '#' . get_tag_regex( $tag ) . '#', $content, $matches ) ) {
-            $html[] = $matches[0];
+    $tags = implode( '|', $allowed_media_types );
+
+    if ( preg_match_all( '#<(?P<tag>' . $tags . ')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches ) ) {
+        foreach ( $matches[0] as $match ) {
+            $html[] = $match;
         }
     }

trunk/tests/phpunit/tests/media.php

@@ -379 +379 @@
 CONTENT;
 
-        $types = array( 'audio', 'video', 'object', 'embed', 'iframe' );
+        $types = array( 'object', 'embed', 'iframe', 'audio', 'video' );
         $contents = array_values( compact( $types ) );
 
@@ -399 +399 @@
         $matches = get_media_embedded_in_content( $content, $types );
         $this->assertEquals( $contents, $matches );
+    }
+
+    function test_get_media_embedded_in_content_order() {
+        $audio =<<<AUDIO
+<audio preload="none">
+    <source />
+</audio>
+AUDIO;
+        $video =<<<VIDEO
+<video preload="none">
+    <source />
+</video>
+VIDEO;
+        $content = $audio . $video;
+
+        $matches1 = get_media_embedded_in_content( $content, array( 'audio', 'video' ) );
+        $this->assertEquals( array( $audio, $video ), $matches1 );
+
+        $reversed = $video . $audio;
+        $matches2 = get_media_embedded_in_content( $reversed, array( 'audio', 'video' ) );
+        $this->assertEquals( array( $video, $audio ), $matches2 );
     }