WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: In `wp_read_image_metadata()`, include IPTC Keywords when available in `$meta`. 

Adds unit test.

Props swissspidy, dbru, SteveHoneyNZ.
Fixes #33772.

Built from https://develop.svn.wordpress.org/trunk@34374


git-svn-id: http://core.svn.wordpress.org/trunk@34338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-22 04:19:24 +00:00
parent e3fcbf5d55
commit 1d513fe737
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/includes/image.php
View File

@ -277,6 +277,7 @@ function wp_read_image_metadata( $file ) {
'shutter_speed' => 0, 'shutter_speed' => 0,
'title' => '', 'title' => '',
'orientation' => 0, 'orientation' => 0,
'keywords' => array(),
); );
/* /*
@ -325,6 +326,10 @@ function wp_read_image_metadata( $file ) {
if ( ! empty( $iptc['2#116'][0] ) ) // copyright if ( ! empty( $iptc['2#116'][0] ) ) // copyright
$meta['copyright'] = trim( $iptc['2#116'][0] ); $meta['copyright'] = trim( $iptc['2#116'][0] );
if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
$meta['keywords'] = array_values( $iptc['2#025'] );
}
} }
} }
@ -410,12 +415,14 @@ function wp_read_image_metadata( $file ) {
* Filter the array of meta data read from an image's exif data. * Filter the array of meta data read from an image's exif data.
* *
* @since 2.5.0 * @since 2.5.0
* @since 4.4.0 The `$iptc` parameter was added.
* *
* @param array $meta Image meta data. * @param array $meta Image meta data.
* @param string $file Path to image file. * @param string $file Path to image file.
* @param int $sourceImageType Type of image. * @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 );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34373'; $wp_version = '4.4-alpha-34374';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.