Ticket #24458: 24458.4.diff

wp-includes/media.php

@@ -2509 +2509 @@
 
         $matched_html = $matches[0];
 
-        // Look for attributes.
-        if ( ! preg_match_all( '#(src|class)=([\'"])(.+?)\2#is', $matched_html, $matches ) || empty( $matches ) )
+        // Look for the class attribute.
+        if ( ! preg_match( '#class=([\'"])(.+?)\1#is', $matched_html, $matches ) || empty( $matches ) )
                 return $attachment_id;
 
-        $attr = array();
-        foreach ( $matches[1] as $key => $attribute_name )
-                $attr[ $attribute_name ] = $matches[3][ $key ];
-
-        if ( ! empty( $attr['class'] ) && false !== strpos( $attr['class'], 'wp-image-' ) )
-                if ( preg_match( '#wp-image-([0-9]+)#i', $attr['class'], $matches ) )
+        $classes = $matches[2];
+        if ( ! empty( $classes ) && false !== strpos( $classes, 'wp-image-' ) )
+                if ( preg_match( '#wp-image-([0-9]+)#i', $classes, $matches ) )
                         $attachment_id = absint( $matches[1] );
 
-        if ( ! $attachment_id && ! empty( $attr['src'] ) )
-                $attachment_id = attachment_url_to_postid( $attr['src'] );
-
         return $attachment_id;
 }