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

Media: Bring consistency to `getimagesize()` error suppression. 

Props chasewg, joemcgill, jeremyfelt.
Merges [42449] to the 4.9 branch.
Fixes #42480.
Built from https://develop.svn.wordpress.org/branches/4.9@42450


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-01-15 20:02:39 +00:00
parent 77ce550e5c
commit 9026b41b3b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ function wp_read_image_metadata( $file ) {
if ( ! file_exists( $file ) ) if ( ! file_exists( $file ) )
return false; return false;
list( , , $sourceImageType ) = getimagesize( $file ); list( , , $sourceImageType ) = @getimagesize( $file );
/* /*
* EXIF contains a bunch of data we'll probably never need formatted in ways * EXIF contains a bunch of data we'll probably never need formatted in ways
@ -372,10 +372,10 @@ function wp_read_image_metadata( $file ) {
* as caption, description etc. * as caption, description etc.
*/ */
if ( is_callable( 'iptcparse' ) ) { if ( is_callable( 'iptcparse' ) ) {
getimagesize( $file, $info ); @getimagesize( $file, $info );
if ( ! empty( $info['APP13'] ) ) { if ( ! empty( $info['APP13'] ) ) {
$iptc = iptcparse( $info['APP13'] ); $iptc = @iptcparse( $info['APP13'] );
// Headline, "A brief synopsis of the caption." // Headline, "A brief synopsis of the caption."
if ( ! empty( $iptc['2#105'][0] ) ) { if ( ! empty( $iptc['2#105'][0] ) ) {

4
wp-admin/includes/media.php
View File

@ -355,7 +355,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
} }
// Use image exif/iptc data for title and caption defaults if possible. // Use image exif/iptc data for title and caption defaults if possible.
} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) { } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) { if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
$title = $image_meta['title']; $title = $image_meta['title'];
} }
@ -419,7 +419,7 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
$content = ''; $content = '';
// Use image exif/iptc data for title and caption defaults if possible. // Use image exif/iptc data for title and caption defaults if possible.
if ( $image_meta = @wp_read_image_metadata($file) ) { if ( $image_meta = wp_read_image_metadata( $file ) ) {
if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
$title = $image_meta['title']; $title = $image_meta['title'];
if ( trim( $image_meta['caption'] ) ) if ( trim( $image_meta['caption'] ) )

2
wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
View File

@ -123,7 +123,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
$file = $file['file']; $file = $file['file'];
// use image exif/iptc data for title and caption defaults if possible // use image exif/iptc data for title and caption defaults if possible
$image_meta = @wp_read_image_metadata( $file ); $image_meta = wp_read_image_metadata( $file );
if ( ! empty( $image_meta ) ) { if ( ! empty( $image_meta ) ) {
if ( empty( $request['title'] ) && trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) { if ( empty( $request['title'] ) && trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {