Ticket #41191: 41191.10.diff

src/wp-admin/css/dashboard.css

@@ -1117 +1117 @@
 }
 
 /* PHP Nag */
-#dashboard_php_nag h2.hndle {
-        border-left: 4px solid #dc3232;
+#dashboard_php_nag .dashicons-warning {
+        color: #df3232;
+        padding-right: 6px;
 }
 
 #dashboard_php_nag h3 {
         font-weight: 600;
 }
 
-#dashboard_php_nag .button.button-hero {
-        display: block;
+#dashboard_php_nag .button-container {
         text-align: center;
 }
 
+#dashboard_php_nag .button.button-hero .dashicons-external {
+        line-height: 42px;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */
 

src/wp-admin/includes/dashboard.php

@@ -35 +35 @@
                 }
         }
 
-        // PHP Version
+        // PHP Version.
         $response = wp_check_php_version();
-        if ( $response && ! $response['is_acceptable'] && current_user_can( 'upgrade_php' ) ) {
-                $title = $response['is_secure'] ? __( 'Your site could be much faster!' ) : __( 'Your site could be much faster and more secure!' );
-                wp_add_dashboard_widget( 'dashboard_php_nag', $title, 'wp_dashboard_php_nag' );
+        if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'upgrade_php' ) ) {
+                wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Required' ), 'wp_dashboard_php_nag' );
         }
 
         // Right Now
@@ -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 = __( 'WordPress has detected that your site is running on an insecure version of PHP, which means that a faster website is just a quick update away.' );
         } 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 = __( 'WordPress has detected that your site is running on an outdated version of PHP, which means that a faster website is just a quick update away.' );
         }
 
         ?>
         <p><?php echo $msg; ?></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>
+        <h3><?php _e( 'What is PHP and how does it affect my site?' ); ?></h3>
+        <p><?php _e( 'PHP is the programming language we use to build and maintain WordPress. Newer versions of PHP are both faster and more secure, so updating will have a positive effect on your site’s performance.' ); ?></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>
+        <h3><?php _e( 'How can I update my PHP version?' ); ?></h3>
+        <p><?php _e( 'Click the button below to head to an update page with additional details on PHP, how to update your version, and what to do in case you can&#8217;t update your site.' ); ?></p>
+        <p class="button-container">
+                <?php
+                        printf(
+                                '<a class="button button-primary button-hero" 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 about updating PHP' ),
+                                /* 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>
+        <p><?php _e( 'Updating your PHP version normally takes just a few minutes. The instructions we provide will help you with a secure, painless update.' ); ?></p>
         <?php
 }
 
@@ -1648 +1651 @@
  *
  * @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 ) {
@@ -1665 +1673 @@
 
                 $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 );
 

src/wp-admin/includes/template.php

@@ -1140 +1140 @@
                                                 echo '<span class="toggle-indicator" aria-hidden="true"></span>';
                                                 echo '</button>';
                                         }
-                                        echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
+                                        echo '<h2 class="hndle">';
+                                        if ( 'dashboard_php_nag' === $box['id'] ) {
+                                                echo '<span class="screen-reader-text">' . __( 'Warning:' ) . '</span>';
+                                                echo '<span aria-hidden="true" class="dashicons dashicons-warning"></span>';
+                                        }
+                                        echo "<span>{$box['title']}</span>";
+                                        echo "</h2>\n";
                                         echo '<div class="inside">' . "\n";
                                         call_user_func( $box['callback'], $object, $box );
                                         echo "</div>\n";