Changeset 35405

Timestamp:

10/26/2015 06:41:31 PM (9 years ago)

Author:

SergeyBiryukov

Message:

After [35402], don't unnecessary run wp_get_attachment_metadata(), wp_get_attachment_image_srcset(), and wp_get_attachment_image_sizes() in wp_img_add_srcset_and_sizes().

See #34379.

File:

• trunk/src/wp-includes/media.php (modified) (4 diffs)

trunk/src/wp-includes/media.php

@@ -1146 +1146 @@
     $width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : false;
 
-    if ( $id && false === $size ) {
+    if ( $id && ! $size ) {
         $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : false;
 
@@ -1153 +1153 @@
         }
     }
-
-    $meta = wp_get_attachment_metadata( $id );
 
     /*
@@ -1160 +1158 @@
      * metadata to match the 'src' against the available sizes for an attachment.
      */
-    if ( ! $size && ! empty( $id ) && is_array( $meta ) ) {
+    if ( $id && ! $size ) {
+        $meta = wp_get_attachment_metadata( $id );
+
         // Parse the image src value from the img element.
         $src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : false;
 
-        // Return early if the src value is empty.
-        if ( ! $src ) {
+        // Return early if the metadata does not exist or the src value is empty.
+        if ( ! $meta || ! $src ) {
             return $image;
         }
@@ -1188 +1188 @@
     }
 
-    $srcset = wp_get_attachment_image_srcset( $id, $size );
-    $sizes  = wp_get_attachment_image_sizes( $id, $size, $width );
-
     // If ID and size exist, try for 'srcset' and 'sizes' and update the markup.
-    if ( $id && $size && $srcset && $sizes ) {
-        // Format the srcset and sizes string and escape attributes.
-        $srcset_and_sizes = sprintf( ' srcset="%s" sizes="%s"', esc_attr( $srcset ), esc_attr( $sizes) );
-
-        // Add srcset and sizes attributes to the image markup.
-        $image = preg_replace( '/<img ([^>]+)[\s?][\/?]>/', '<img $1' . $srcset_and_sizes . ' />', $image );
+    if ( $id && $size ) {
+        $srcset = wp_get_attachment_image_srcset( $id, $size );
+        $sizes  = wp_get_attachment_image_sizes( $id, $size, $width );
+
+        if ( $srcset && $sizes ) {
+            // Format the srcset and sizes string and escape attributes.
+            $srcset_and_sizes = sprintf( ' srcset="%s" sizes="%s"', esc_attr( $srcset ), esc_attr( $sizes) );
+
+            // Add srcset and sizes attributes to the image markup.
+            $image = preg_replace( '/<img ([^>]+)[\s?][\/?]>/', '<img $1' . $srcset_and_sizes . ' />', $image );
+        }
     }