Ticket #26674: 26674.patch

Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php (revision 26746)
+++ wp-includes/functions.php (working copy)
@@ -4116,7 +4116,7 @@
 function get_tag_regex( $tag ) {
        if ( empty( $tag ) )
                return;
-       return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
+       return sprintf( '<%1$s[^<]*?(?:>[\s\S]*?<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
 /**
 


Index: tests/phpunit/tests/media.php
===================================================================
--- tests/phpunit/tests/media.php       (revision 26862)
+++ tests/phpunit/tests/media.php       (working copy)
@@ -292,8 +292,11 @@
        $embed =<<<EMBED
<embed src="something.mp4"/>
EMBED;
+               $img =<<<IMG
+<img src="kittens.jpg" alt="Cute Kittens"/>
+IMG;
        $iframe =<<<IFRAME
-<iframe src="youtube.com" width="7000" />
+<iframe src="youtube.com" width="7000"></iframe>
IFRAME;
        $audio =<<<AUDIO
<audio preload="none">
@@ -308,21 +311,45 @@

        $content =<<<CONTENT
This is a comment
+$img
+
+This is a comment
$object

This is a comment
+$iframe
+
+This is a comment
$embed

This is a comment
+$video
+
+This is a comment
+$img
+
+This is a comment
$iframe

This is a comment
$audio

This is a comment
+$embed
+
+This is a comment
+$iframe
+
+This is a comment
$video

This is a comment
+$audio
+
+This is a comment
+$object
+
+This is a comment
CONTENT;

        $types = array( 'audio', 'video', 'object', 'embed', 'iframe' );