X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/784f914b1e4b1c62d6657e86397c2e83bcee4295..0f74cdeda4c069bfbb9c4131ef1352f55b6f8499:/wp-admin/includes/image.php diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index f0cb0e96..4ae53b9c 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -67,8 +67,6 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s * * @since 2.1.0 * - * @global array $_wp_additional_image_sizes - * * @param int $attachment_id Attachment Id to process. * @param string $file Filepath of the Attached image. * @return mixed Metadata for attachment. @@ -78,7 +76,9 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata = array(); $support = false; - if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) { + $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]; @@ -87,27 +87,38 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { $metadata['file'] = _wp_relative_upload_path($file); // Make thumbnails and other intermediate sizes. - global $_wp_additional_image_sizes; + $_wp_additional_image_sizes = wp_get_additional_image_sizes(); $sizes = array(); foreach ( get_intermediate_image_sizes() as $s ) { $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false ); - if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) - $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes - else - $sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options - if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) - $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes - else - $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options - if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) - $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes - else - $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options + if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) { + // For theme-added sizes + $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); + } else { + // For default sizes set in options + $sizes[$s]['width'] = get_option( "{$s}_size_w" ); + } + + if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) { + // For theme-added sizes + $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); + } else { + // For default sizes set in options + $sizes[$s]['height'] = get_option( "{$s}_size_h" ); + } + + if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) { + // For theme-added sizes + $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; + } else { + // For default sizes set in options + $sizes[$s]['crop'] = get_option( "{$s}_crop" ); + } } /** - * Filter the image sizes automatically generated when uploading an image. + * Filters the image sizes automatically generated when uploading an image. * * @since 2.9.0 * @since 4.4.0 Added the `$metadata` argument. @@ -174,7 +185,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { 'post_content' => '', ); /** - * Filter the parameters for the attachment thumbnail creation. + * Filters the parameters for the attachment thumbnail creation. * * @since 3.9.0 * @@ -192,6 +203,70 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { } } } + // Try to create image thumbnails for PDFs + else if ( 'application/pdf' === $mime_type ) { + $fallback_sizes = array( + 'thumbnail', + 'medium', + 'large', + ); + + /** + * Filters the image sizes generated for non-image mime types. + * + * @since 4.7.0 + * + * @param array $fallback_sizes An array of image size names. + */ + $fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata ); + + $sizes = array(); + $_wp_additional_image_sizes = wp_get_additional_image_sizes(); + + foreach ( $fallback_sizes as $s ) { + if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) { + $sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] ); + } else { + $sizes[ $s ]['width'] = get_option( "{$s}_size_w" ); + } + + if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) { + $sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] ); + } else { + $sizes[ $s ]['height'] = get_option( "{$s}_size_h" ); + } + + if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) { + $sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop']; + } else { + // Force thumbnails to be soft crops. + if ( ! 'thumbnail' === $s ) { + $sizes[ $s ]['crop'] = get_option( "{$s}_crop" ); + } + } + } + + // Only load PDFs in an image editor if we're processing sizes. + if ( ! empty( $sizes ) ) { + $editor = wp_get_image_editor( $file ); + + if ( ! is_wp_error( $editor ) ) { // No support for this type of file + $uploaded = $editor->save( $file, 'image/jpeg' ); + unset( $editor ); + + // Resize based on the full size image, rather than the source. + if ( ! is_wp_error( $uploaded ) ) { + $editor = wp_get_image_editor( $uploaded['path'] ); + unset( $uploaded['path'] ); + + if ( ! is_wp_error( $editor ) ) { + $metadata['sizes'] = $editor->multi_resize( $sizes ); + $metadata['sizes']['full'] = $uploaded; + } + } + } + } + } // Remove the blob of binary data from the array. if ( $metadata ) { @@ -199,7 +274,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { } /** - * Filter the generated attachment meta data. + * Filters the generated attachment meta data. * * @since 2.1.0 * @@ -337,7 +412,7 @@ function wp_read_image_metadata( $file ) { } /** - * Filter the image types to check for exif data. + * Filters the image types to check for exif data. * * @since 2.5.0 * @@ -417,7 +492,7 @@ function wp_read_image_metadata( $file ) { $meta = wp_kses_post_deep( $meta ); /** - * Filter the array of meta data read from an image's exif data. + * Filters the array of meta data read from an image's exif data. * * @since 2.5.0 * @since 4.4.0 The `$iptc` parameter was added. @@ -465,7 +540,7 @@ function file_is_displayable_image($path) { } /** - * Filter whether the current image is displayable in the browser. + * Filters whether the current image is displayable in the browser. * * @since 2.5.0 * @@ -506,7 +581,7 @@ function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) { } if ( is_resource($image) ) { /** - * Filter the current image being loaded for editing. + * Filters the current image being loaded for editing. * * @since 2.9.0 * @@ -542,7 +617,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) { if ( $filepath && file_exists( $filepath ) ) { if ( 'full' != $size && ( $data = image_get_intermediate_size( $attachment_id, $size ) ) ) { /** - * Filter the path to the current image. + * Filters the path to the current image. * * The filter is evaluated for all image sizes except 'full'. * @@ -554,9 +629,9 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) { */ $filepath = apply_filters( 'load_image_to_edit_filesystempath', path_join( dirname( $filepath ), $data['file'] ), $attachment_id, $size ); } - } elseif ( function_exists( 'fopen' ) && function_exists( 'ini_get' ) && true == ini_get( 'allow_url_fopen' ) ) { + } elseif ( function_exists( 'fopen' ) && true == ini_get( 'allow_url_fopen' ) ) { /** - * Filter the image URL if not in the local filesystem. + * Filters the image URL if not in the local filesystem. * * The filter is only evaluated if fopen is enabled on the server. * @@ -570,7 +645,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) { } /** - * Filter the returned path or URL of the current image. + * Filters the returned path or URL of the current image. * * @since 2.9.0 *