Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-02 05:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Media: Consistency in logic to pass wp_getimagesize() tests.

Browse Source 
Previously, we used `DIR_TESTDATA` to determine if a test should skip a newly silenced error in `wp_getimagesize()`.

We are now using `WP_RUN_CORE_TESTS` instead for consistency.

Props hellofromTonya, SergeyBiryukov.
See #49889.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
antpb 2021-02-02 21:36:03 +00:00
parent a2fb85da68
commit b566631d5e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -721,7 +721,7 @@ function wp_read_image_metadata( $file ) {
if ( ! empty( $info['APP13'] ) ) { if ( ! empty( $info['APP13'] ) ) {
if ( if (
// Skip when running unit tests. // Skip when running unit tests.
! defined( 'DIR_TESTDATA' ) ! defined( 'WP_RUN_CORE_TESTS' )
&& &&
// Process without silencing errors when in debug mode. // Process without silencing errors when in debug mode.
defined( 'WP_DEBUG' ) && WP_DEBUG defined( 'WP_DEBUG' ) && WP_DEBUG
@ -792,7 +792,7 @@ function wp_read_image_metadata( $file ) {
if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) { if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) {
if ( if (
// Skip when running unit tests. // Skip when running unit tests.
! defined( 'DIR_TESTDATA' ) ! defined( 'WP_RUN_CORE_TESTS' )
&& &&
// Process without silencing errors when in debug mode. // Process without silencing errors when in debug mode.
defined( 'WP_DEBUG' ) && WP_DEBUG defined( 'WP_DEBUG' ) && WP_DEBUG

2
wp-includes/media.php
View File

@ -4975,7 +4975,7 @@ function wp_show_heic_upload_error( $plupload_settings ) {
function wp_getimagesize( $filename, &$imageinfo = array() ) { function wp_getimagesize( $filename, &$imageinfo = array() ) {
if ( if (
// Skip when running unit tests. // Skip when running unit tests.
! defined( 'DIR_TESTDATA' ) ! defined( 'WP_RUN_CORE_TESTS' )
&& &&
// Return without silencing errors when in debug mode. // Return without silencing errors when in debug mode.
defined( 'WP_DEBUG' ) && WP_DEBUG defined( 'WP_DEBUG' ) && WP_DEBUG

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-alpha-50169'; $wp_version = '5.7-alpha-50170';
/** /**
* 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.