Changeset 35402

Timestamp:

10/26/2015 04:28:27 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Remove assignments from conditions in wp_get_attachment_image() and wp_img_add_srcset_and_sizes().

See #34379.

File:

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

trunk/src/wp-includes/media.php

@@ -810 +810 @@
             $default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
 
-        $attr = wp_parse_args($attr, $default_attr);
+        $attr   = wp_parse_args( $attr, $default_attr );
+        $srcset = wp_get_attachment_image_srcset( $attachment_id, $size );
+        $sizes  = wp_get_attachment_image_sizes( $attachment_id, $size, $width );
 
         // Generate srcset and sizes if not already present.
-        if ( empty( $attr['srcset'] ) && ( $srcset = wp_get_attachment_image_srcset( $attachment_id, $size ) ) && ( $sizes = wp_get_attachment_image_sizes( $attachment_id, $size, $width ) ) ) {
+        if ( empty( $attr['srcset'] ) && $srcset && $sizes ) {
             $attr['srcset'] = $srcset;
 
@@ -1149 +1151 @@
     }
 
+    $meta = wp_get_attachment_metadata( $id );
+
     /*
      * If attempts to parse the size value failed, attempt to use the image
      * metadata to match the 'src' against the available sizes for an attachment.
      */
-    if ( ! $size && ! empty( $id ) && is_array( $meta = wp_get_attachment_metadata( $id ) ) ) {
+    if ( ! $size && ! empty( $id ) && is_array( $meta ) ) {
         // Parse the image src value from the img element.
         $src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : false;
@@ -1181 +1185 @@
     }
 
+    $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 = wp_get_attachment_image_srcset( $id, $size ) ) && ( $sizes = wp_get_attachment_image_sizes( $id, $size, $width ) ) ) {
+    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) );