<!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>[44735] trunk/src/wp-admin: Admin: Improve logic of PHP version check on about page.</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/44735">44735</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/44735","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-02-08 01:52:17 +0000 (Fri, 08 Feb 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'>Admin: Improve logic of PHP version check on about page.
Props noisysocks, peterwilsoncc.
See <a href="https://core.trac.wordpress.org/ticket/46161">#46161</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminaboutphp"></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/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2019-02-08 01:27:39 UTC (rev 44734)
+++ trunk/src/wp-admin/about.php 2019-02-08 01:52:17 UTC (rev 44735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,10 @@
</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"> <div class="feature-section one-col cta">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( true ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $response = wp_check_php_version();
+ if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) :
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <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>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2019-02-08 01:27:39 UTC (rev 44734)
+++ trunk/src/wp-admin/includes/dashboard.php 2019-02-08 01:52:17 UTC (rev 44735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1667,51 +1667,6 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 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;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_empty() {}
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></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/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2019-02-08 01:27:39 UTC (rev 44734)
+++ trunk/src/wp-admin/includes/misc.php 2019-02-08 01:52:17 UTC (rev 44735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2011,3 +2011,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_privacy_policy_content( __( 'WordPress' ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>