$src_file = get_attached_file( $src );
if ( ! file_exists( $src_file ) ) {
- // If the file doesn't exist, attempt a url fopen on the src link.
+ // If the file doesn't exist, attempt a URL fopen on the src link.
// This can occur with certain file replication plugins.
$src = _load_image_to_edit_path( $src, 'full' );
} else {
*
* @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.
* Filter the image sizes automatically generated when uploading an image.
*
* @since 2.9.0
+ * @since 4.4.0 Added the `$metadata` argument.
*
- * @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 );
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' );
}
}
// Remove the blob of binary data from the array.
- if ( isset( $metadata['image']['data'] ) )
+ if ( $metadata ) {
unset( $metadata['image']['data'] );
+ }
/**
* Filter the generated attachment meta data.
'shutter_speed' => 0,
'title' => '',
'orientation' => 0,
+ 'keywords' => array(),
);
+ $iptc = array();
/*
* Read IPTC first, since it might contain data not available in exif such
* as caption, description etc.
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();
+ 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 ( $caption_length < 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( $meta['title'] ) && ! empty( $exif['Title'] ) ) {
- $meta['title'] = trim( $exif['Title'] );
- }
-
if ( ! empty( $exif['ImageDescription'] ) ) {
mbstring_binary_safe_encoding();
$description_length = strlen( $exif['ImageDescription'] );
if ( empty( $meta['title'] ) && $description_length < 80 ) {
// Assume the title is stored in ImageDescription
$meta['title'] = trim( $exif['ImageDescription'] );
- if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) {
- $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
- }
- } elseif ( empty( $meta['caption'] ) && 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( $meta['caption'] ) && ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
+ } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
$meta['caption'] = trim( $exif['Comments'] );
}
}
}
- foreach ( $meta as &$value ) {
- if ( is_string( $value ) ) {
- $value = wp_kses_post( $value );
+ foreach ( $meta['keywords'] as $key => $keyword ) {
+ if ( ! seems_utf8( $keyword ) ) {
+ $meta['keywords'][ $key ] = utf8_encode( $keyword );
}
}
+ $meta = wp_kses_post_deep( $meta );
+
/**
* 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 );
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff