if ( ! $dst_file )
$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
- // The directory containing the original file may no longer exist when
- // using a replication plugin.
+ /*
+ * The directory containing the original file may no longer exist when
+ * using a replication plugin.
+ */
wp_mkdir_p( dirname( $dst_file ) );
$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
*
* @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.
$metadata['width'] = $imagesize[0];
$metadata['height'] = $imagesize[1];
- // Make the file path relative to the upload dir
+ // Make the file path relative to the upload dir.
$metadata['file'] = _wp_relative_upload_path($file);
- // make thumbnails and other intermediate sizes
+ // Make thumbnails and other intermediate sizes.
global $_wp_additional_image_sizes;
$sizes = array();
* Filter the image sizes automatically generated when uploading an image.
*
* @since 2.9.0
+ * @since 4.4.0 The `$metadata` argument was addeed
*
- * @param array $sizes An associative array of image sizes.
+ * @param array $sizes An associative array of image sizes.
+ * @param array $metadata An associative array of image metadata: width, height, file.
*/
- $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
+ $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes, $metadata );
if ( $sizes ) {
$editor = wp_get_image_editor( $file );
$metadata['sizes'] = array();
}
- // fetch additional metadata from exif/iptc
+ // Fetch additional metadata from EXIF/IPTC.
$image_meta = wp_read_image_metadata( $file );
if ( $image_meta )
$metadata['image_meta'] = $image_meta;
- } elseif ( preg_match( '#^video/#', get_post_mime_type( $attachment ) ) ) {
+ } elseif ( wp_attachment_is( 'video', $attachment ) ) {
$metadata = wp_read_video_metadata( $file );
$support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
- } elseif ( preg_match( '#^audio/#', get_post_mime_type( $attachment ) ) ) {
+ } elseif ( wp_attachment_is( 'audio', $attachment ) ) {
$metadata = wp_read_audio_metadata( $file );
$support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
}
if ( $support && ! empty( $metadata['image']['data'] ) ) {
- // check for existing cover
+ // Check for existing cover.
$hash = md5( $metadata['image']['data'] );
$posts = get_posts( array(
'fields' => 'ids',
}
}
- // remove the blob of binary data from the array
- if ( isset( $metadata['image']['data'] ) )
+ // Remove the blob of binary data from the array.
+ if ( $metadata ) {
unset( $metadata['image']['data'] );
+ }
/**
* Filter the generated attachment meta data.
list( , , $sourceImageType ) = getimagesize( $file );
- // exif contains a bunch of data we'll probably never need formatted in ways
- // that are difficult to use. We'll normalize it and just extract the fields
- // that are likely to be useful. Fractions and numbers are converted to
- // floats, dates to unix timestamps, and everything else to strings.
+ /*
+ * EXIF contains a bunch of data we'll probably never need formatted in ways
+ * that are difficult to use. We'll normalize it and just extract the fields
+ * that are likely to be useful. Fractions and numbers are converted to
+ * floats, dates to unix timestamps, and everything else to strings.
+ */
$meta = array(
'aperture' => 0,
'credit' => '',
'iso' => 0,
'shutter_speed' => 0,
'title' => '',
+ 'orientation' => 0,
+ 'keywords' => array(),
);
- // read iptc first, since it might contain data not available in exif such
- // as caption, description etc
+ $iptc = array();
+ /*
+ * Read IPTC first, since it might contain data not available in exif such
+ * as caption, description etc.
+ */
if ( is_callable( 'iptcparse' ) ) {
getimagesize( $file, $info );
if ( ! empty( $info['APP13'] ) ) {
$iptc = iptcparse( $info['APP13'] );
- // headline, "A brief synopsis of the caption."
- if ( ! empty( $iptc['2#105'][0] ) )
+ // Headline, "A brief synopsis of the caption."
+ if ( ! empty( $iptc['2#105'][0] ) ) {
$meta['title'] = trim( $iptc['2#105'][0] );
- // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
- elseif ( ! empty( $iptc['2#005'][0] ) )
+ /*
+ * Title, "Many use the Title field to store the filename of the image,
+ * though the field may be used in many ways."
+ */
+ } elseif ( ! empty( $iptc['2#005'][0] ) ) {
$meta['title'] = trim( $iptc['2#005'][0] );
+ }
if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
$caption = trim( $iptc['2#120'][0] );
- if ( empty( $meta['title'] ) ) {
+
+ mbstring_binary_safe_encoding();
+ $caption_length = strlen( $caption );
+ reset_mbstring_encoding();
+
+ if ( empty( $meta['title'] ) && $caption_length < 80 ) {
// Assume the title is stored in 2:120 if it's short.
- if ( strlen( $caption ) < 80 )
- $meta['title'] = $caption;
- else
- $meta['caption'] = $caption;
- } elseif ( $caption != $meta['title'] ) {
- $meta['caption'] = $caption;
+ $meta['title'] = $caption;
}
+
+ $meta['caption'] = $caption;
}
if ( ! empty( $iptc['2#110'][0] ) ) // credit
elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
$meta['credit'] = trim( $iptc['2#080'][0] );
- if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time
+ if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
if ( ! empty( $iptc['2#116'][0] ) ) // copyright
$meta['copyright'] = trim( $iptc['2#116'][0] );
+
+ if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
+ $meta['keywords'] = array_values( $iptc['2#025'] );
+ }
}
}
if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
$exif = @exif_read_data( $file );
- if ( !empty( $exif['Title'] ) )
- $meta['title'] = trim( $exif['Title'] );
-
if ( ! empty( $exif['ImageDescription'] ) ) {
- if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
+ mbstring_binary_safe_encoding();
+ $description_length = strlen( $exif['ImageDescription'] );
+ reset_mbstring_encoding();
+
+ if ( empty( $meta['title'] ) && $description_length < 80 ) {
// Assume the title is stored in ImageDescription
$meta['title'] = trim( $exif['ImageDescription'] );
- if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] )
- $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
- } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) {
+ }
+
+ if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
+ $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+ }
+
+ if ( empty( $meta['caption'] ) ) {
$meta['caption'] = trim( $exif['ImageDescription'] );
}
- } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
+ } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
$meta['caption'] = trim( $exif['Comments'] );
}
- if ( ! empty( $exif['Artist'] ) )
- $meta['credit'] = trim( $exif['Artist'] );
- elseif ( ! empty($exif['Author'] ) )
- $meta['credit'] = trim( $exif['Author'] );
+ if ( empty( $meta['credit'] ) ) {
+ if ( ! empty( $exif['Artist'] ) ) {
+ $meta['credit'] = trim( $exif['Artist'] );
+ } elseif ( ! empty($exif['Author'] ) ) {
+ $meta['credit'] = trim( $exif['Author'] );
+ }
+ }
- if ( ! empty( $exif['Copyright'] ) )
+ if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
$meta['copyright'] = trim( $exif['Copyright'] );
- if ( ! empty($exif['FNumber'] ) )
+ }
+ if ( ! empty( $exif['FNumber'] ) ) {
$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
- if ( ! empty($exif['Model'] ) )
+ }
+ if ( ! empty( $exif['Model'] ) ) {
$meta['camera'] = trim( $exif['Model'] );
- if ( ! empty($exif['DateTimeDigitized'] ) )
- $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] );
- if ( ! empty($exif['FocalLength'] ) )
+ }
+ if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
+ $meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
+ }
+ if ( ! empty( $exif['FocalLength'] ) ) {
$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
- if ( ! empty($exif['ISOSpeedRatings'] ) ) {
+ }
+ if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
$meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
$meta['iso'] = trim( $meta['iso'] );
}
- if ( ! empty($exif['ExposureTime'] ) )
+ if ( ! empty( $exif['ExposureTime'] ) ) {
$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+ }
+ if ( ! empty( $exif['Orientation'] ) ) {
+ $meta['orientation'] = $exif['Orientation'];
+ }
}
foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
- if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) )
+ if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
$meta[ $key ] = utf8_encode( $meta[ $key ] );
+ }
+ }
+
+ foreach ( $meta as &$value ) {
+ if ( is_string( $value ) ) {
+ $value = wp_kses_post( $value );
+ }
}
/**
* Filter 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.
*
* @param array $meta Image meta data.
* @param string $file Path to image file.
* @param int $sourceImageType Type of image.
+ * @param array $iptc IPTC data.
*/
- return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType );
+ return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
}
* @return bool True if suitable, false if not suitable.
*/
function file_is_displayable_image($path) {
- $info = @getimagesize($path);
- if ( empty($info) )
+ $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
+
+ $info = @getimagesize( $path );
+ if ( empty( $info ) ) {
$result = false;
- elseif ( !in_array($info[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) ) // only gif, jpeg and png images can reliably be displayed
+ } elseif ( ! in_array( $info[2], $displayable_image_types ) ) {
$result = false;
- else
+ } else {
$result = true;
+ }
/**
* Filter whether the current image is displayable in the browser.
$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
- // The directory containing the original file may no longer exist when
- // using a replication plugin.
+ /*
+ * The directory containing the original file may no longer
+ * exist when using a replication plugin.
+ */
wp_mkdir_p( dirname( $dst_file ) );
if ( ! @copy( $src_file, $dst_file ) )
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff