Ticket #26675: 26675.patch

wp-includes/media.php

@@ -1977 +1977 @@
 }
 
 /**
- * Check the content blob for an <audio>, <video> <object>, <embed>, or <iframe>
+ * Check the content blob for an <img>, <audio>, <video> <object>, <embed>, or <iframe>
  *
  * @since 3.6.0
  *
  * @param string $content A string which might contain media data.
- * @param array $types array of media types: 'audio', 'video', 'object', 'embed', or 'iframe'
+ * @param array $types array of media types: 'img', 'audio', 'video', 'object', 'embed', or 'iframe'
+ * @param string $sortby A string which defines how to sort the results.
  * @return array A list of found HTML media embeds
  */
-function get_media_embedded_in_content( $content, $types = null ) {
+function get_media_embedded_in_content( $content, $types = null, $sortby = 'type' ) {
         $html = array();
-        $allowed_media_types = array( 'audio', 'video', 'object', 'embed', 'iframe' );
+
+        $allowed_media_types = array( 'audio', 'video', 'object', 'embed', 'iframe', 'img' );
         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];
+        if ( 'source' == $sortby ) {
+                $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;
+                        }
+                }
+        } else {
+                foreach ( $allowed_media_types as $tag ) {
+                        if ( preg_match_all( '#' . get_tag_regex( $tag ) . '#', $content, $matches ) ) {
+                                foreach ( $matches[0] as $match ) {
+                                        $html[] = $match;
+                                }
+                        }
                 }
         }