Changeset 35498

Timestamp:

11/04/2015 12:21:23 AM (9 years ago)

Author:

azaozz

Message:

Responsive images:

• Fix _wp_upload_dir_baseurl() to cache by blog_id.
• Replace path_join() with trailingslashit(), it's much faster.
• Rename $image_url to $image_src for consistency (used at about 50 other places).
• Couple of tests fixes.

See #34430.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (12 diffs)
• tests/phpunit/tests/media.php (modified) (3 diffs)

trunk/src/wp-includes/media.php

@@ -887 +887 @@
  */
 function _wp_upload_dir_baseurl() {
-    static $baseurl = null;
-
-    if ( ! $baseurl ) {
+    static $baseurl = array();
+
+    $blog_id = get_current_blog_id();
+
+    if ( empty( $baseurl[$blog_id] ) ) {
         $uploads_dir = wp_upload_dir();
-        $baseurl = $uploads_dir['baseurl'];
-    }
-
-    return $baseurl;
+        $baseurl[$blog_id] = $uploads_dir['baseurl'];
+    }
+
+    return $baseurl[$blog_id];
 }
 
@@ -946 +948 @@
     }
 
-    $image_url = $image[0];
+    $image_src = $image[0];
     $size_array = array(
         absint( $image[1] ),
@@ -952 +954 @@
     );
 
-    return wp_calculate_image_srcset( $image_url, $size_array, $image_meta, $attachment_id );
+    return wp_calculate_image_srcset( $image_src, $size_array, $image_meta, $attachment_id );
 }
 
@@ -960 +962 @@
  * @since 4.4.0
  *
- * @param string $image_name    The file name, path, URL, or partial path or URL, of the image being matched.
+ * @param string $image_src     The 'src' of the image.
  * @param array  $size_array    Array of width and height values in pixels (in that order).
  * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
@@ -966 +968 @@
  * @return string|bool          The 'srcset' attribute value. False on error or when only one source exists.
  */
-function wp_calculate_image_srcset( $image_name, $size_array, $image_meta, $attachment_id = 0 ) {
+function wp_calculate_image_srcset( $image_src, $size_array, $image_meta, $attachment_id = 0 ) {
     if ( empty( $image_meta['sizes'] ) ) {
         return false;
@@ -981 +983 @@
         return false;
     }
+
+    $image_basename = wp_basename( $image_meta['file'] );
+    $image_baseurl = _wp_upload_dir_baseurl();
 
     // Add full size to the '$image_sizes' array.
@@ -986 +991 @@
         'width'  => $image_meta['width'],
         'height' => $image_meta['height'],
-        'file'   => wp_basename( $image_meta['file'] ),
+        'file'   => $image_basename,
     );
 
-    $image_baseurl = _wp_upload_dir_baseurl();
-    $dirname = dirname( $image_meta['file'] );
-
-    if ( $dirname !== '.' ) {
-        $image_baseurl = path_join( $image_baseurl, $dirname );
-    }
+    // Uploads are (or have been) in year/month sub-directories.
+    if ( $image_basename !== $image_meta['file'] ) {
+        $dirname = dirname( $image_meta['file'] );
+
+        if ( $dirname !== '.' ) {
+            $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
+        }
+    }
+
+    $image_baseurl = trailingslashit( $image_baseurl );
 
     // Calculate the image aspect ratio.
@@ -1004 +1013 @@
      * out images that are leftovers from previous versions.
      */
-    $image_edited = preg_match( '/-e[0-9]{13}/', $image_name, $image_edit_hash );
+    $image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
 
     /**
@@ -1034 +1043 @@
             continue;
         }
-
-        $candidate_url = $image['file'];
 
         // Calculate the new image ratio.
@@ -1045 +1052 @@
 
         // If the new ratio differs by less than 0.01, use it.
-        if ( abs( $image_ratio - $image_ratio_compare ) < 0.01 && ! array_key_exists( $candidate_url, $sources ) ) {
+        if ( abs( $image_ratio - $image_ratio_compare ) < 0.01 ) {
             // Add the URL, descriptor, and value to the sources array to be returned.
             $sources[ $image['width'] ] = array(
-                'url'        => path_join( $image_baseurl, $candidate_url ),
+                'url'        => $image_baseurl . $image['file'],
                 'descriptor' => 'w',
                 'value'      => $image['width'],
@@ -1101 +1108 @@
  * @param int          $attachment_id Optional. Image attachment ID. Either `$image_meta` or `$attachment_id` is needed
  *                                    when using the image size name as argument for `$size`.
- * @param string       $image_url     Optional. The URL to the image file.
+ * @param string       $image_src     Optional. The URL to the image file.
  *
  * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
  */
-function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_id = 0, $image_url = null ) {
+function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_id = 0, $image_src = null ) {
     $width = 0;
 
@@ -1140 +1147 @@
      * @param array        $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
      * @param int          $attachment_id Image attachment ID of the original image.
-     * @param string       $image_url     Optional. The URL to the image file.
-     */
-    return apply_filters( 'wp_get_attachment_image_sizes', $sizes, $size, $image_meta, $attachment_id, $image_url );
+     * @param string       $image_src     Optional. The URL to the image file.
+     */
+    return apply_filters( 'wp_get_attachment_image_sizes', $sizes, $size, $image_meta, $attachment_id, $image_src );
 }
 

trunk/tests/phpunit/tests/media.php

@@ -786 +786 @@
         foreach ( $sizes as $size ) {
             $size_array = $this->_get_image_size_array_from_name( $size );
-            $image_url = wp_get_attachment_image_url( self::$large_id, $size );
+            $image_url = wp_get_attachment_image_url( $id, $size );
             $this->assertSame( $expected, wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
         }
+
+        // Remove the attachment
+        wp_delete_attachment( $id );
 
         // Leave the uploads option the way you found it.
@@ -801 +804 @@
         // Start by getting the attachment metadata.
         $image_meta = wp_get_attachment_metadata( self::$large_id );
-        $image_url = wp_get_attachment_image_url( self::$large_id );
+        $image_url = wp_get_attachment_image_url( self::$large_id, 'medium' );
         $size_array = $this->_get_image_size_array_from_name( 'medium' );
 
@@ -807 +810 @@
         $hash = 'e' . time() . rand(100, 999);
 
+        $filename_base = basename( $image_meta['file'], '.png' );
+
+        // Add the hash to the image URL
+        $image_url = str_replace( $filename_base, $filename_base . '-' . $hash, $image_url );
+
         // Replace file paths for full and medium sizes with hashed versions.
-        $filename_base = basename( $image_meta['file'], '.png' );
         $image_meta['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['file'] );
         $image_meta['sizes']['medium']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium']['file'] );