Ticket #35106: 35106.diff

src/wp-includes/media.php

@@ -866 +866 @@
  *
  * @since 4.4.0
  *
  * @param int          $attachment_id Image attachment ID.
  * @param string|array $size          Optional. Image size to retrieve. Accepts any valid image size, or an array
  *                                    of width and height values in pixels (in that order). Default 'thumbnail'.
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return string|false Attachment URL or false if no image is available.
  */
 function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) {
         $image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
         return isset( $image['0'] ) ? $image['0'] : false;
 }
 
 /**
+ * Get the attachment path relative to the upload directory.
+ *
+ * @since 4.4.1
+ * @access private
+ *
+ * @param string $file Attachment file name.
+ * @return string Attachment path relative to the upload directory.
+ */
+function _wp_get_attachment_relative_path( $file ) {
+        $dirname = dirname( $file );
+
+        if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+                // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
+                $dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
+                $dirname = ltrim( $dirname, '/' );
+        }
+
+        if ( '.' === $dirname ) {
+                return '';
+        }
+
+        return $dirname;
+}
+
+/**
  * Caches and returns the base URL of the uploads directory.
  *
  * @since 4.4.0
  * @access private
  *
  * @return string The base URL, cached.
  */
 function _wp_upload_dir_baseurl() {
         static $baseurl = array();
 
         $blog_id = get_current_blog_id();
 
         if ( empty( $baseurl[$blog_id] ) ) {
                 $uploads_dir = wp_upload_dir();
                 $baseurl[$blog_id] = $uploads_dir['baseurl'];
@@ -994 +1019 @@
          * To avoid hiding animation in user content, if src is a full size GIF, a srcset attribute is not generated.
          * If src is an intermediate size GIF, the full size is excluded from srcset to keep a flattened GIF from becoming animated.
          */
         if ( ! isset( $image_sizes['thumbnail']['mime-type'] ) || 'image/gif' !== $image_sizes['thumbnail']['mime-type'] ) {
                 $image_sizes['full'] = array(
                         'width'  => $image_meta['width'],
                         'height' => $image_meta['height'],
                         'file'   => $image_basename,
                 );
         } elseif ( strpos( $image_src, $image_meta['file'] ) ) {
                 return false;
         }
 
         // Uploads are (or have been) in year/month sub-directories.
         if ( $image_basename !== $image_meta['file'] ) {
-                $dirname = dirname( $image_meta['file'] );
+                $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
 
-                if ( $dirname !== '.' ) {
+                if ( $dirname ) {
                         $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
                 }
         }
 
         $image_baseurl = trailingslashit( $image_baseurl );
 
         /*
          * Images that have been edited in WordPress after being uploaded will
          * contain a unique hash. Look for that hash and use it later to filter
          * out images that are leftovers from previous versions.
          */
         $image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
 
         /**
          * Filter the maximum image width to be included in a 'srcset' attribute.
@@ -1277 +1302 @@
         // Return early if we couldn't get the image source.
         if ( ! $image_src ) {
                 return $image;
         }
 
         // Bail early if an image has been inserted and later edited.
         if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
                 strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
 
                 return $image;
         }
 
         $base_url = trailingslashit( _wp_upload_dir_baseurl() );
         $image_base_url = $base_url;
 
-        $dirname = dirname( $image_meta['file'] );
-        if ( $dirname !== '.' ) {
+        $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+        if ( $dirname ) {
                 $image_base_url .= trailingslashit( $dirname );
         }
 
         $all_sizes = wp_list_pluck( $image_meta['sizes'], 'file' );
 
         foreach ( $all_sizes as $key => $file ) {
                 $all_sizes[ $key ] = $image_base_url . $file;
         }
 
         // Add the original image.
-        $all_sizes[] = $base_url . $image_meta['file'];
+        $all_sizes[] = $image_base_url . basename( $image_meta['file'] );
 
         // Bail early if the image src doesn't match any of the known image sizes.
         if ( ! in_array( $image_src, $all_sizes ) ) {
                 return $image;
         }
 
         $width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
         $height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
 
         if ( ! $width || ! $height ) {
                 /*
                  * If attempts to parse the size value failed, attempt to use the image meta data to match
                  * the image file name from 'src' against the available sizes for an attachment.
                  */
                 $image_filename = wp_basename( $image_src );

src/wp-includes/post.php

@@ -4867 +4867 @@
                 return false;
 
         if ( 'attachment' != $post->post_type )
                 return false;
 
         $url = '';
         // Get attached file.
         if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) {
                 // Get upload directory.
                 if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) {
                         // Check that the upload base exists in the file location.
                         if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
                                 // Replace file location with url location.
                                 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
                         } elseif ( false !== strpos($file, 'wp-content/uploads') ) {
-                                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+                                // Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
+                                $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
                         } else {
                                 // It's a newly-uploaded file, therefore $file is relative to the basedir.
                                 $url = $uploads['baseurl'] . "/$file";
                         }
                 }
         }
 
         /*
          * If any of the above options failed, Fallback on the GUID as used pre-2.7,
          * not recommended to rely upon this.
          */
         if ( empty($url) ) {
                 $url = get_the_guid( $post->ID );
         }
 

tests/phpunit/tests/media.php

@@ -854 +854 @@
                 $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'] );
                 $image_meta['sizes']['medium_large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium_large']['file'] );
                 $image_meta['sizes']['large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['large']['file'] );
 
                 // Calculate a srcset array.
                 $sizes = explode( ', ', wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
 
                 // Test to confirm all sources in the array include the same edit hash.
                 foreach ( $sizes as $size ) {
                         $this->assertTrue( false !== strpos( $size, $hash ) );
                 }
         }
 
         /**
+         * @ticket 35106
+         */
+        function test_wp_calculate_image_srcset_with_absolute_path_in_meta() {
+                global $_wp_additional_image_sizes;
+
+                $year_month = date('Y/m');
+                $image_meta = wp_get_attachment_metadata( self::$large_id );
+                $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
+
+                // Set up test cases for all expected size names.
+                $intermediates = array( 'medium', 'medium_large', 'large', 'full' );
+
+                // Add any soft crop intermediate sizes.
+                foreach ( $_wp_additional_image_sizes as $name => $additional_size ) {
+                        if ( ! $_wp_additional_image_sizes[$name]['crop'] || 0 === $_wp_additional_image_sizes[$name]['height'] ) {
+                                $intermediates[] = $name;
+                        }
+                }
+
+                $expected = '';
+
+                foreach( $image_meta['sizes'] as $name => $size ) {
+                        // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
+                        if ( in_array( $name, $intermediates ) ) {
+                                $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
+                        }
+                }
+
+                // Add the full size width at the end.
+                $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
+
+                // Prepend an absolute path to simulate a pre-2.7 upload
+                $image_meta['file'] = 'H:\home\wordpress\trunk/wp-content/uploads/' . $image_meta['file'];
+
+                foreach ( $intermediates as $int ) {
+                        $image_url = wp_get_attachment_image_url( self::$large_id, $int );
+                        $size_array = $this->_get_image_size_array_from_name( $int );
+                        $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
+                }
+        }
+
+        /**
          * @ticket 33641
          */
         function test_wp_calculate_image_srcset_false() {
                 $sizes = wp_calculate_image_srcset( array( 400, 300 ), 'file.png', array() );
 
                 // For canola.jpg we should return
                 $this->assertFalse( $sizes );
         }
 
         /**
          * @ticket 33641
          */
         function test_wp_calculate_image_srcset_no_width() {
                 $file = get_attached_file( self::$large_id );
                 $image_url = wp_get_attachment_image_url( self::$large_id, 'medium' );