Ticket #31050: 31050.5.patch

src/wp-admin/includes/image.php

@@ -78 +78 @@
 
         $metadata = array();
         $support = false;
-        if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) {
+
+        /**
+         * Filter attachment mime-types that support thumbnail fallback.
+         *
+         * @since 4.5.0
+         *
+         * @param array $mime_types An array of mime-types.
+         */
+        $attachment_fallback_mimetypes = apply_filters( 'attachment_fallback_mimetypes', array( 'application/pdf' ) );
+        $mime_type = get_post_mime_type( $attachment );
+
+        if ( preg_match( '!^image/!', $mime_type ) && file_is_displayable_image( $file ) ) {
                 $imagesize = getimagesize( $file );
                 $metadata['width'] = $imagesize[0];
                 $metadata['height'] = $imagesize[1];
@@ -193 +204 @@
                 }
         }
 
+        // Check to see if we support a fallback thumbnail for this mime-type.
+        else if ( in_array( $mime_type, $attachment_fallback_mimetypes ) && wp_image_editor_supports( array( 'mime_type' => $mime_type ) ) ) {
+
+                $editor = wp_get_image_editor( $file );
+
+                if ( ! is_wp_error( $editor ) ) {
+                        $uploaded = $editor->save( $file . '.jpg' );
+
+                        if ( ! is_wp_error( $uploaded ) ) {
+                                $sizes = array(
+                                        'thumbnail' => array(
+                                                'width'  => get_option( "thumbnail_size_w" ),
+                                                'height' => get_option( "thumbnail_size_h" ),
+                                                'crop'   => get_option( "thumbnail_crop" ),
+                                        ),
+                                );
+
+                                $metadata['width'] = $uploaded['width'];
+                                $metadata['height'] = $uploaded['height'];
+                                $metadata['file'] = _wp_relative_upload_path( dirname( $file ) . '/' . $uploaded['file'] );
+                                $metadata['sizes'] = $editor->multi_resize( $sizes );
+                        }
+                }
+        }
+
         // Remove the blob of binary data from the array.
         if ( $metadata ) {
                 unset( $metadata['image']['data'] );

src/wp-admin/includes/media.php

@@ -2753 +2753 @@
 
                 echo wp_video_shortcode( $attr );
 
+        else :
+                $image = wp_get_attachment_image( $attachment_id, 'full', false, array( 'style' => 'max-width:100%' ) );
+
+                if ( $image ) {
+                        echo '<div class="wp_attachment_image wp-clearfix" id="media-head-' . $attachment_id . '">';
+                        echo '<p id="thumbnail-head-<?php echo $attachment_id; ?>">' . $image . '</p>';
+                        echo '</div>';
+                }
+
         endif; ?>
         </div>
         <div class="wp_attachment_details edit-form-section">

src/wp-includes/media-template.php

@@ -290 +290 @@
                         <div class="thumbnail thumbnail-{{ data.type }}">
                                 <# if ( data.uploading ) { #>
                                         <div class="media-progress-bar"><div></div></div>
-                                <# } else if ( 'image' === data.type && data.sizes && data.sizes.large ) { #>
+                                <# } else if ( data.sizes && data.sizes.large ) { #>
                                         <img class="details-image" src="{{ data.sizes.large.url }}" draggable="false" alt="" />
-                                <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
+                                <# } else if ( data.sizes && data.sizes.full ) { #>
                                         <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" alt="" />
                                 <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
                                         <img class="details-image icon" src="{{ data.icon }}" draggable="false" alt="" />
@@ -454 +454 @@
                                         <div class="centered">
                                                 <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #>
                                                         <img src="{{ data.image.src }}" class="thumbnail" draggable="false" alt="" />
+                                                <# } else if ( data.sizes && data.sizes.full ) { #>
+                                                        <img src="{{ data.sizes.full.url }}" class="thumbnail" draggable="false" alt="" />
                                                 <# } else { #>
                                                         <img src="{{ data.icon }}" class="icon" draggable="false" alt="" />
                                                 <# } #>

src/wp-includes/media.php

@@ -163 +163 @@
  *                     the image is an intermediate size. False on failure.
  */
 function image_downsize( $id, $size = 'medium' ) {
+        $is_image = wp_attachment_is_image( $id );
 
-        if ( !wp_attachment_is_image($id) )
-                return false;
+        if ( $is_image ) {
+                /**
+                 * Filter whether to preempt the output of image_downsize().
+                 *
+                 * Passing a truthy value to the filter will effectively short-circuit
+                 * down-sizing the image, returning that value as output instead.
+                 *
+                 * @since 2.5.0
+                 *
+                 * @param bool         $downsize Whether to short-circuit the image downsize. Default false.
+                 * @param int          $id       Attachment ID for image.
+                 * @param array|string $size     Size of image. Image size or array of width and height values (in that order).
+                 *                               Default 'medium'.
+                 */
+                if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
+                        return $out;
+                }
+        }
 
-        /**
-         * Filter whether to preempt the output of image_downsize().
-         *
-         * Passing a truthy value to the filter will effectively short-circuit
-         * down-sizing the image, returning that value as output instead.
-         *
-         * @since 2.5.0
-         *
-         * @param bool         $downsize Whether to short-circuit the image downsize. Default false.
-         * @param int          $id       Attachment ID for image.
-         * @param array|string $size     Size of image. Image size or array of width and height values (in that order).
-         *                               Default 'medium'.
-         */
-        if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
-                return $out;
+        $meta = wp_get_attachment_metadata($id);
+
+        if ( ! $meta || empty( $meta['sizes'] ) ) {
+                return false;
         }
 
         $img_url = wp_get_attachment_url($id);
-        $meta = wp_get_attachment_metadata($id);
         $width = $height = 0;
         $is_intermediate = false;
         $img_url_basename = wp_basename($img_url);
 
+        if ( ! $is_image ) {
+                $img_url = str_replace( $img_url_basename, wp_basename( $meta['file'] ), $img_url );
+                $img_url_basename = wp_basename( $meta['file'] );
+        }
+
         // try for a new style intermediate size
         if ( $intermediate = image_get_intermediate_size($id, $size) ) {
                 $img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
@@ -206 +216 @@
                         $is_intermediate = true;
                 }
         }
+
         if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
                 // any other type: use the real image
                 $width = $meta['width'];
@@ -1006 +1017 @@
          */
         $image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id );
 
-        if ( empty( $image_meta['sizes'] ) ) {
+        if ( empty( $image_meta['file'] ) || empty( $image_meta['sizes'] ) ) {
                 return false;
         }
 
@@ -3090 +3101 @@
         if ( current_user_can( 'delete_post', $attachment->ID ) )
                 $response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
 
-        if ( $meta && 'image' === $type ) {
+        if ( $meta && ! empty( $meta['sizes'] ) ) {
                 $sizes = array();
 
                 /** This filter is documented in wp-admin/includes/media.php */
@@ -3138 +3149 @@
                         }
                 }
 
-                $sizes['full'] = array( 'url' => $attachment_url );
+                if ( 'image' === $type ) {
+                        $sizes['full'] = array( 'url' => $attachment_url );
+                }
+                else {
+                        $sizes['full'] = array( 'url' => $base_url . wp_basename( $meta['file'] ) );
+                }
 
                 if ( isset( $meta['height'], $meta['width'] ) ) {
                         $sizes['full']['height'] = $meta['height'];
@@ -3147 +3163 @@
                 }
 
                 $response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-        } elseif ( $meta && 'video' === $type ) {
+        }
+
+        if ( $meta && 'video' === $type ) {
                 if ( isset( $meta['width'] ) )
                         $response['width'] = (int) $meta['width'];
                 if ( isset( $meta['height'] ) )