Changeset 50170

Timestamp:

02/02/2021 09:34:40 PM (4 years ago)

Author:

antpb

Message:

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

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.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/image.php

@@ -722 +722 @@
             if (
                 // Skip when running unit tests.
-                ! defined( 'DIR_TESTDATA' )
+                ! defined( 'WP_RUN_CORE_TESTS' )
                 &&
                 // Process without silencing errors when in debug mode.
@@ -793 +793 @@
         if (
             // Skip when running unit tests.
-            ! defined( 'DIR_TESTDATA' )
+            ! defined( 'WP_RUN_CORE_TESTS' )
             &&
             // Process without silencing errors when in debug mode.

trunk/src/wp-includes/media.php

@@ -4976 +4976 @@
     if (
         // Skip when running unit tests.
-        ! defined( 'DIR_TESTDATA' )
+        ! defined( 'WP_RUN_CORE_TESTS' )
         &&
         // Return without silencing errors when in debug mode.