<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46267] trunk/src/wp-admin/includes/class-wp-site-health.php: Site Health: Improve wording for PHP update warning.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46267">46267</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46267","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-23 19:38:56 +0000 (Mon, 23 Sep 2019)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Site Health: Improve wording for PHP update warning.

Props danieltj, garrett-eclipse, marybaum, afragen, chetan200891.
Fixes <a href="https://core.trac.wordpress.org/ticket/47644">#47644</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php      2019-09-23 19:28:43 UTC (rev 46266)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php        2019-09-23 19:38:56 UTC (rev 46267)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        $result['status'] = 'good';
</span><span class="cx" style="display: block; padding: 0 10px">                                        $result['label']  = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %s: The current version of WordPress installed on this site. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                __( 'Your WordPress version is up to date (%s)' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         __( 'Your version of WordPress (%s) is up to date' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 $core_current_version
</span><span class="cx" style="display: block; padding: 0 10px">                                        );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +654,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $result = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'label'       => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: The current PHP version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                __( 'PHP is up to date (%s)' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         __( 'Your version of PHP (%s) is up to date' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 PHP_VERSION
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'status'      => 'good',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,7 +664,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'description' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                '<p>%s</p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                __( '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&#8217;s performance.' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         sprintf(
+                                       /* translators: %s: The minimum recommended PHP version. */
+                                       __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are faster and more secure, so staying up to date will help your site&#8217;s overall performance and security. The minimum recommended version of PHP is %s.' ),
+                                       $response['recommended_version']
+                               )
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'actions'     => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                '<p><a href="%s" target="_blank" rel="noopener noreferrer">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,9 +685,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return $result;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The PHP version is older than the recommended version, but still acceptable.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // The PHP version is older than the recommended version, but still receiving active support.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $response['is_supported'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $result['label']  = __( 'We recommend that you update PHP' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $result['label'] = sprintf(
+                               /* translators: %s: The server PHP version. */
+                               __( 'Your version of PHP (%s) is out of date' ),
+                               PHP_VERSION
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        return $result;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,7 +699,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // The PHP version is only receiving security fixes.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( $response['is_secure'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $result['label']  = __( 'Your PHP version should be updated' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $result['label'] = sprintf(
+                               /* translators: %s: The server PHP version. */
+                               __( 'Your version of PHP (%s) should be updated' ),
+                               PHP_VERSION
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        return $result;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,7 +710,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Anything no longer secure must be updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $result['label']          = __( 'Your PHP version requires an update' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $result['label'] = sprintf(
+                       /* translators: %s: The server PHP version. */
+                       __( 'Your version of PHP (%s) requires an update' ),
+                       PHP_VERSION
+               );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $result['status']         = 'critical';
</span><span class="cx" style="display: block; padding: 0 10px">                $result['badge']['label'] = __( 'Security' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>