Changeset 38949 for trunk/src/wp-includes/media.php

Timestamp:

10/26/2016 07:27:51 AM (10 years ago)

Author:

mikeschroder

Message:

Media: Add support for rendering PDF thumbnails.

When support for PDFs is available, on upload,
render 'Thumbnail', 'Medium', 'Large', and 'Full' sizes of
the first page, and save them in attachment meta.

Use these renders within Add Media, Media Gallery and List views,
Attachment Details, Post/Attachment Edit screens, and Attachment pages.

Support available by default via Imagick -> ImageMagick -> Ghostscript,
but can be provided by any WP_Image_Editor that supports PDFs.

Props adamsilverstein, azaozz, celloexpressions, desrosj, dglingren, ericlewis, ipstenu, joemcgill, joyously, markoheijnen, melchoyce, mikeschroder, tomauger.
Fixes #31050.

File:

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

trunk/src/wp-includes/media.php

@@ -184 +184 @@
  */
 function image_downsize( $id, $size = 'medium' ) {
-
-        if ( !wp_attachment_is_image($id) )
-                return false;
+        $is_image = wp_attachment_is_image( $id );
 
         /**
@@ -210 +208 @@
         $is_intermediate = false;
         $img_url_basename = wp_basename($img_url);
+
+        // If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
+        // Otherwise, a non-image type could be returned.
+        if ( ! $is_image ) {
+                if ( ! empty( $meta['sizes'] ) ) {
+                        $img_url = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
+                        $img_url_basename = $meta['sizes']['full']['file'];
+                        $width = $meta['sizes']['full']['width'];
+                        $height = $meta['sizes']['full']['height'];
+                } else {
+                        return false;
+                }
+        }
 
         // try for a new style intermediate size
@@ -685 +696 @@
         if ( is_array( $size ) ) {
                 $candidates = array();
+
+                if ( ! isset( $imagedata['file'] ) && isset( $imagedata['sizes']['full'] ) ) {
+                        $imagedata['height'] = $imagedata['sizes']['full']['height'];
+                        $imagedata['width']  = $imagedata['sizes']['full']['width'];
+                }
 
                 foreach ( $imagedata['sizes'] as $_size => $data ) {
@@ -739 +755 @@
 
         // include the full filesystem path of the intermediate file
-        if ( empty($data['path']) && !empty($data['file']) ) {
+        if ( empty( $data['path'] ) && ! empty( $data['file'] ) && ! empty( $imagedata['file'] ) ) {
                 $file_url = wp_get_attachment_url($post_id);
                 $data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
@@ -3124 +3140 @@
                 $response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
 
-        if ( $meta && 'image' === $type ) {
+        if ( $meta && ! empty( $meta['sizes'] ) ) {
                 $sizes = array();
 
@@ -3172 +3188 @@
                 }
 
-                $sizes['full'] = array( 'url' => $attachment_url );
-
-                if ( isset( $meta['height'], $meta['width'] ) ) {
-                        $sizes['full']['height'] = $meta['height'];
-                        $sizes['full']['width'] = $meta['width'];
-                        $sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
-                }
-
-                $response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-        } elseif ( $meta && 'video' === $type ) {
+                if ( 'image' === $type ) {
+                        $sizes['full'] = array( 'url' => $attachment_url );
+
+                        if ( isset( $meta['height'], $meta['width'] ) ) {
+                                $sizes['full']['height'] = $meta['height'];
+                                $sizes['full']['width'] = $meta['width'];
+                                $sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
+                        }
+
+                        $response = array_merge( $response, $sizes['full'] );
+                } elseif ( $meta['sizes']['full']['file'] ) {
+                        $sizes['full'] = array(
+                                'url'         => $base_url . $meta['sizes']['full']['file'],
+                                'height'      => $meta['sizes']['full']['height'],
+                                'width'       => $meta['sizes']['full']['width'],
+                                'orientation' => $meta['sizes']['full']['height'] > $meta['sizes']['full']['width'] ? 'portrait' : 'landscape'
+                        );
+                }
+
+                $response = array_merge( $response, array( 'sizes' => $sizes ) );
+        }
+
+        if ( $meta && 'video' === $type ) {
                 if ( isset( $meta['width'] ) )
                         $response['width'] = (int) $meta['width'];