From ba2d023bad3feddc53db974d42e6f8a09a32ddde Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 30 Sep 2019 16:27:11 +0000 Subject: [PATCH] Media: Move `wp_get_original_image_path()` to `wp-content/post.php` to make it easier to access from plugins. Props pbiron. See #47873. git-svn-id: https://develop.svn.wordpress.org/trunk@46353 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/image.php | 37 -------------------------------- src/wp-includes/post.php | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index fe7c691e7c..6456676434 100644 --- a/src/wp-admin/includes/image.php +++ b/src/wp-admin/includes/image.php @@ -1034,40 +1034,3 @@ function _copy_image_file( $attachment_id ) { return $dst_file; } - -/** - * Retrieves the path to an uploaded image. - * - * Similar to `get_attached_file()` however some images may have been - * processed after uploading to make them "web ready". - * In this case this function returns the path to the originally uploaded image file. - * - * @since 5.3.0 - * - * @param int $attachment_id Attachment ID. - * @return string|false Path to the original image file or false if the attachment is not an image. - */ -function wp_get_original_image_path( $attachment_id ) { - if ( ! wp_attachment_is_image( $attachment_id ) ) { - return false; - } - - $image_meta = wp_get_attachment_metadata( $attachment_id ); - $image_file = get_attached_file( $attachment_id ); - - if ( empty( $image_meta['original_image'] ) ) { - $original_image = $image_file; - } else { - $original_image = path_join( dirname( $image_file ), $image_meta['original_image'] ); - } - - /** - * Filters the path to the original image. - * - * @since 5.3.0 - * - * @param string $original_image Path to original image file. - * @param int $attachment_id Attachment ID. - */ - return apply_filters( 'wp_get_original_image_path', $original_image, $attachment_id ); -} diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php index 12a80e972a..51e45f2d92 100644 --- a/src/wp-includes/post.php +++ b/src/wp-includes/post.php @@ -7140,3 +7140,41 @@ function get_available_post_mime_types( $type = 'attachment' ) { $types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) ); return $types; } + +/** + * Retrieves the path to an uploaded image file. + * + * Similar to `get_attached_file()` however some images may have been processed after uploading + * to make them suitable for web use. In this case the attached "full" size file is usually replaced + * with a scaled down version of the original image. This function always returns the path + * to the originally uploaded image file. + * + * @since 5.3.0 + * + * @param int $attachment_id Attachment ID. + * @return string|false Path to the original image file or false if the attachment is not an image. + */ +function wp_get_original_image_path( $attachment_id ) { + if ( ! wp_attachment_is_image( $attachment_id ) ) { + return false; + } + + $image_meta = wp_get_attachment_metadata( $attachment_id ); + $image_file = get_attached_file( $attachment_id ); + + if ( empty( $image_meta['original_image'] ) ) { + $original_image = $image_file; + } else { + $original_image = path_join( dirname( $image_file ), $image_meta['original_image'] ); + } + + /** + * Filters the path to the original image. + * + * @since 5.3.0 + * + * @param string $original_image Path to original image file. + * @param int $attachment_id Attachment ID. + */ + return apply_filters( 'wp_get_original_image_path', $original_image, $attachment_id ); +}