<!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>[44627] trunk/src: Plugins: Use centralized API to display information about updating PHP when a plugin requires a higher version.</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/44627">44627</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/44627","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-16 17:05:37 +0000 (Wed, 16 Jan 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'>Plugins: Use centralized API to display information about updating PHP when a plugin requires a higher version.
This changeset uses the API functions introduced in <a href="https://core.trac.wordpress.org/changeset/44476">[44476]</a> to link to the resource about updating PHP when highlighting a plugin's required PHP version is not met. It furthermore expands them, introducing a new `wp_update_php_annotation()` function that prints the markup to indicate that the default URL has been altered by the web host, allowing it to be reused universally.
Furthermore, this changeset adds missing `update_php` capability checks before displaying the information about updating PHP.
Props afragen.
Fixes <a href="https://core.trac.wordpress.org/ticket/45986">#45986</a>. See <a href="https://core.trac.wordpress.org/ticket/43986">#43986</a>, <a href="https://core.trac.wordpress.org/ticket/45686">#45686</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2019-01-16 16:50:15 UTC (rev 44626)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2019-01-16 17:05:37 UTC (rev 44627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,19 +635,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice inline notice-error notice-alt"><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php && ! $compatible_wp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'This plugin doesn’t work with your versions of WordPress and PHP. ' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( current_user_can( 'update_core' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: "Update WordPress" screen URL, 2: "Updating PHP" page URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: "Update WordPress" screen URL, 2: "Update PHP" page URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%1$s">Please update WordPress</a>, and then <a href="%2$s">learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'update-core.php' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( __( 'https://wordpress.org/support/update-php/' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( wp_get_update_php_url() )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_php_annotation();
+ } elseif ( current_user_can( 'update_core' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: "Updating PHP" page URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: "Update WordPress" screen URL */
+ __( '<a href="%s">Please update WordPress</a>.' ),
+ self_admin_url( 'update-core.php' )
+ );
+ } elseif ( current_user_can( 'update_php' ) ) {
+ printf(
+ /* translators: %s: "Update PHP" page URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%s">Learn more about updating PHP</a>.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( __( 'https://wordpress.org/support/update-php/' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( wp_get_update_php_url() )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_php_annotation();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $compatible_wp ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'This plugin doesn’t work with your version of WordPress. ' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,11 +668,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $compatible_php ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'This plugin doesn’t work with your version of PHP. ' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- /* translators: %s: "Updating PHP" page URL */
- __( '<a href="%s">Learn more about updating PHP</a>.' ),
- esc_url( __( 'https://wordpress.org/support/update-php/' ) )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'update_php' ) ) {
+ printf(
+ /* translators: %s: "Update PHP" page URL */
+ __( '<a href="%s">Learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
+ wp_update_php_annotation();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p></div>';
</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-01-16 16:50:15 UTC (rev 44626)
+++ trunk/src/wp-admin/includes/dashboard.php 2019-01-16 17:05:37 UTC (rev 44627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1626,9 +1626,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'WordPress has detected that your site is running on an outdated version of PHP.' );
</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">- $update_url = wp_get_update_php_url();
- $default_url = wp_get_default_update_php_url();
-
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $msg; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,7 +1636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<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>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( $update_url ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( wp_get_update_php_url() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Learn more about updating PHP' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: accessibility text */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '(opens in a new tab)' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1648,19 +1645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $update_url !== $default_url ) {
- ?>
- <p class="description">
- <?php
- printf(
- /* translators: %s: default Update PHP page URL */
- __( 'This resource is provided by your web host, and is specific to your site. For more information, <a href="%s" target="_blank">see the official WordPress documentation</a>.' ),
- esc_url( $default_url )
- );
- ?>
- </p>
- <?php
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_php_annotation();
</ins><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></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2019-01-16 16:50:15 UTC (rev 44626)
+++ trunk/src/wp-admin/includes/plugin-install.php 2019-01-16 17:05:37 UTC (rev 44627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,12 +762,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice notice-error notice-alt"><p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- /* translators: "Updating PHP" page URL */
- __( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>, so unfortunately you cannot install it. <a href="%s" target="_blank">Click here to learn more about updating PHP</a>.' ),
- esc_url( __( 'https://wordpress.org/support/update-php/' ) )
- );
- echo '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' );
+ if ( current_user_can( 'update_php' ) ) {
+ printf(
+ /* translators: %s: "Update PHP" page URL */
+ ' ' . __( '<a href="%s" target="_blank">Click here to learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
+ echo '</p>';
+ wp_update_php_annotation();
+ } else {
+ echo '</p>';
+ }
+ echo '</div>';
</ins><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"> if ( ! $tested_wp ) {
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-01-16 16:50:15 UTC (rev 44626)
+++ trunk/src/wp-includes/functions.php 2019-01-16 17:05:37 UTC (rev 44627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6716,3 +6716,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_default_update_php_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> return _x( 'https://wordpress.org/support/update-php/', 'localized PHP upgrade information page' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Prints the default annotation for the web host altering the "Update PHP" page URL.
+ *
+ * This function is to be used after {@see wp_get_update_php_url()} to display a consistent
+ * annotation if the web host has altered the default "Update PHP" page URL.
+ *
+ * @since 5.1.0
+ */
+function wp_update_php_annotation() {
+ $update_url = wp_get_update_php_url();
+ $default_url = wp_get_default_update_php_url();
+
+ if ( $update_url === $default_url ) {
+ return;
+ }
+
+ echo '<p class="description">';
+ printf(
+ /* translators: %s: default Update PHP page URL */
+ __( 'This resource is provided by your web host, and is specific to your site. For more information, <a href="%s" target="_blank">see the official WordPress documentation</a>.' ),
+ esc_url( $default_url )
+ );
+ echo'</p>';
+}
</ins></span></pre>
</div>
</div>
</body>
</html>