Changeset 44735

Timestamp:

02/08/2019 01:52:17 AM (6 years ago)

Author:

peterwilsoncc

Message:

Admin: Improve logic of PHP version check on about page.

Props noisysocks, peterwilsoncc.
See #46161.

Location:

trunk/src/wp-admin

Files:

• about.php (modified) (1 diff)
• includes/dashboard.php (modified) (1 diff)
• includes/misc.php (modified) (1 diff)

trunk/src/wp-admin/about.php

@@ -89 +89 @@
 
         <div class="feature-section one-col cta">
-            <?php if ( true ) : ?>
+            <?php
+            $response = wp_check_php_version();
+            if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) :
+                ?>
                 <p><em><?php _e( 'WordPress has detected your site is running an outdated version of PHP. You will see this notice on your dashboard with instructions for contacting your host.' ); ?></em></p>
             <?php endif; ?>

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

@@ -1665 +1665 @@
 
     return $classes;
-}
-
-/**
- * Checks if the user needs to update PHP.
- *
- * @since 5.1.0
- *
- * @return array|false $response Array of PHP version data. False on failure.
- */
-function wp_check_php_version() {
-    $version = phpversion();
-    $key     = md5( $version );
-
-    $response = get_site_transient( 'php_check_' . $key );
-    if ( false === $response ) {
-        $url = 'http://api.wordpress.org/core/serve-happy/1.0/';
-        if ( wp_http_supports( array( 'ssl' ) ) ) {
-            $url = set_url_scheme( $url, 'https' );
-        }
-
-        $url = add_query_arg( 'php_version', $version, $url );
-
-        $response = wp_remote_get( $url );
-
-        if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
-            return false;
-        }
-
-        /**
-         * Response should be an array with:
-         *  'recommended_version' - string - The PHP version recommended by WordPress.
-         *  'is_supported' - boolean - Whether the PHP version is actively supported.
-         *  'is_secure' - boolean - Whether the PHP version receives security updates.
-         *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
-         */
-        $response = json_decode( wp_remote_retrieve_body( $response ), true );
-
-        if ( ! is_array( $response ) ) {
-            return false;
-        }
-
-        set_site_transient( 'php_check_' . $key, $response, WEEK_IN_SECONDS );
-    }
-
-    return $response;
 }
 

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

@@ -2012 +2012 @@
     }
 }
+
+/**
+ * Checks if the user needs to update PHP.
+ *
+ * @since 5.1.0
+ *
+ * @return array|false $response Array of PHP version data. False on failure.
+ */
+function wp_check_php_version() {
+    $version = phpversion();
+    $key     = md5( $version );
+
+    $response = get_site_transient( 'php_check_' . $key );
+    if ( false === $response ) {
+        $url = 'http://api.wordpress.org/core/serve-happy/1.0/';
+        if ( wp_http_supports( array( 'ssl' ) ) ) {
+            $url = set_url_scheme( $url, 'https' );
+        }
+
+        $url = add_query_arg( 'php_version', $version, $url );
+
+        $response = wp_remote_get( $url );
+
+        if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+            return false;
+        }
+
+        /**
+         * Response should be an array with:
+         *  'recommended_version' - string - The PHP version recommended by WordPress.
+         *  'is_supported' - boolean - Whether the PHP version is actively supported.
+         *  'is_secure' - boolean - Whether the PHP version receives security updates.
+         *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
+         */
+        $response = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        if ( ! is_array( $response ) ) {
+            return false;
+        }
+
+        set_site_transient( 'php_check_' . $key, $response, WEEK_IN_SECONDS );
+    }
+
+    return $response;
+}