Ticket #41191: 41191.11.2.diff

src/wp-admin/css/dashboard.css

@@ -1117 +1117 @@
 }
 
 /* PHP Nag */
-#dashboard_php_nag h2.hndle {
-        border-left: 4px solid #dc3232;
-}
 
-#dashboard_php_nag h3 {
-        font-weight: 600;
+#dashboard_php_nag .dashicons-external {
+        margin: -2px -3px 0 0;
 }
 
-#dashboard_php_nag .button.button-hero {
-        display: block;
-        text-align: center;
-}
-
 /* =Media Queries
 -------------------------------------------------------------- */
 

src/wp-admin/includes/dashboard.php

@@ -1618 +1617 @@
                 return;
         }
 
-        $information_url = _x( 'https://wordpress.org/support/upgrade-php/', 'localized PHP upgrade information page' );
-
-        if ( ! $response['is_secure'] ) {
-                $msg = __( 'WordPress has detected that your site is running on an insecure version of PHP, which is why we’re showing you this notice.' );
+        if ( isset( $response['is_secure'] ) && ! $response['is_secure'] ) {
+                $msg = __( 'Your site is running an insecure version of PHP. Please update immediately.' );
         } else {
-                $msg = __( 'WordPress has detected that your site is running on an outdated version of PHP, which is why we’re showing you this notice.' );
+                $msg = __( 'Your site is running a version of PHP that is no longer supported.' );
         }
 
         ?>
         <p><?php echo $msg; ?></p>
+        <p><?php printf( __( 'You are running %s, but %s is recommended.' ), '<strong>' . phpversion() . '</strong>', '<strong>' . $response['recommended_version'] . '</strong>' ); ?></p>
 
-        <h3><?php _e( 'What is PHP and why should I care?' ); ?></h3>
-        <p><?php _e( 'PHP is the programming language that WordPress is built on. Newer versions of PHP are both faster and more secure, so upgrading is better for your site, and better for the people who are building WordPress.' ); ?></p>
-        <p><?php _e( 'If you want to know exactly how PHP works and why it is important, continue reading.' ); ?></p>
+        <hr />
+        <p><?php _e( 'Current versions of PHP are faster and more secure.' ); ?></p>
+        <p><?php _e( 'Updating will make your WordPress experience safer and more enjoyable, and it can usually be done in just a few minutes.' ); ?></p>
 
-        <h3><?php _e( 'How can I upgrade my PHP version?' ); ?></h3>
-        <p><?php _e( 'The button below will take you to a page with more details on what PHP is, how to upgrade your PHP version, and what to do if it turns out you can&#8217;t.' ); ?></p>
-        <p>
-                <a class="button button-primary button-hero" href="<?php echo esc_url( $information_url ); ?>"><?php _e( 'Show me how to upgrade my PHP' ); ?></a>
+        <p class="button-container">
+                <?php
+                        printf(
+                                '<a class="button button-primary" href="%1$s" target="_blank" rel="noopener noreferrer">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+                                esc_url( _x( 'https://wordpress.org/support/upgrade-php/', 'localized PHP upgrade information page' ) ),
+                                __( 'Learn more' ),
+                                /* translators: accessibility text */
+                                __( '(opens in a new tab)' )
+                        );
+                ?>
         </p>
-
-        <p><?php _e( 'Upgrading usually takes only a few minutes and should be safe if you follow the provided instructions.' ); ?></p>
         <?php
 }
 
@@ -1648 +1650 @@
  *
  * @since 5.0.0
  *
- * @return array Array of PHP version data.
+ * @return array|false $response Array of PHP version data. False on failure.
  */
 function wp_check_php_version() {
         $version = phpversion();
-        $key     = md5( $version );
 
+        if ( false === $version ) {
+                return false;
+        }
+
+        $key = md5( $version );
+
         $response = get_site_transient( 'php_check_' . $key );
         if ( false === $response ) {
                 $url = 'http://api.wordpress.org/core/serve-happy/1.0/';
@@ -1665 +1672 @@
 
                 $response = wp_remote_get( $url );
 
-                if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+                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
+                 *  '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 );