Changeset 51066

Timestamp:

06/03/2021 11:13:14 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Site Health: Remove unnecessary function_exists() checks from WP_Site_Health::get_tests().

By the time the tests run, both wp_is_site_protected_by_basic_auth() and rest_url() functions are available, so there is no need to check for their existence.

Follow-up to [44986], [51057].

Props Clorith, costdev, SergeyBiryukov.
Fixes #52642.

File:

• trunk/src/wp-admin/includes/class-wp-site-health.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -2311 +2311 @@
                     'test'  => 'http_requests',
                 ),
+                'rest_availability'         => array(
+                    'label'     => __( 'REST API availability' ),
+                    'test'      => 'rest_availability',
+                    'skip_cron' => true,
+                ),
                 'debug_enabled'             => array(
                     'label' => __( 'Debugging enabled' ),
@@ -2353 +2358 @@
 
         // Conditionally include Authorization header test if the site isn't protected by Basic Auth.
-        if ( function_exists( 'wp_is_site_protected_by_basic_auth' ) ) {
-            if ( ! wp_is_site_protected_by_basic_auth() ) {
-                $tests['async']['authorization_header'] = array(
-                    'label'     => __( 'Authorization header' ),
-                    'test'      => rest_url( 'wp-site-health/v1/tests/authorization-header' ),
-                    'has_rest'  => true,
-                    'headers'   => array( 'Authorization' => 'Basic ' . base64_encode( 'user:pwd' ) ),
-                    'skip_cron' => true,
-                );
-            }
-        }
-
-        // Conditionally include REST rules if the function for it exists.
-        if ( function_exists( 'rest_url' ) ) {
-            $tests['direct']['rest_availability'] = array(
-                'label'     => __( 'REST API availability' ),
-                'test'      => 'rest_availability',
+        if ( ! wp_is_site_protected_by_basic_auth() ) {
+            $tests['async']['authorization_header'] = array(
+                'label'     => __( 'Authorization header' ),
+                'test'      => rest_url( 'wp-site-health/v1/tests/authorization-header' ),
+                'has_rest'  => true,
+                'headers'   => array( 'Authorization' => 'Basic ' . base64_encode( 'user:pwd' ) ),
                 'skip_cron' => true,
             );