<!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>[45546] trunk/src/wp-admin/includes/plugin.php: Plugins: When validating plugin's WordPress and PHP requirements, check for `Requires at least` and `Requires PHP` headers in the plugin's main PHP file.</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/45546">45546</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/45546","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-06-18 03:23:53 +0000 (Tue, 18 Jun 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: When validating plugin's WordPress and PHP requirements, check for `Requires at least` and `Requires PHP` headers in the plugin's main PHP file.
This allows for blocking plugin activation if it requires a higher version of PHP or WordPress, and does not have a `readme.txt` file.
If the headers are defined in both `readme.txt` and the main plugin file, precedence is given to the plugin file.
Props afragen, Otto42, Ipstenu.
Fixes <a href="https://core.trac.wordpress.org/ticket/46938">#46938</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2019-06-17 19:16:16 UTC (rev 45545)
+++ trunk/src/wp-admin/includes/plugin.php 2019-06-18 03:23:53 UTC (rev 45546)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Network: Optional. Specify "Network: true" to require that a plugin is activated
</span><span class="cx" style="display: block; padding: 0 10px"> * across all sites in an installation. This will prevent a plugin from being
</span><span class="cx" style="display: block; padding: 0 10px"> * activated on a single site when Multisite is enabled.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Requires at least: Optional. Specify the minimum required WordPress version.
+ * Requires PHP: Optional. Specify the minimum required PHP version.
</ins><span class="cx" style="display: block; padding: 0 10px"> * * / # Remove the space to close comment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Some users have issues with opening large files and manipulating the contents
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * reading.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 Added support for `Requires at least` and `Requires PHP`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $plugin_file Absolute path to the main plugin file.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $markup Optional. If the returned data should have HTML markup applied.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +66,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $TextDomain Plugin textdomain.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $DomainPath Plugins relative directory path to .mo files.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $Network Whether the plugin can only be activated network-wide.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $RequiresWP Minimum required version of WordPress.
+ * @type string $RequiresPHP Minimum required version of PHP.
</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"> function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,6 +82,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'TextDomain' => 'Text Domain',
</span><span class="cx" style="display: block; padding: 0 10px"> 'DomainPath' => 'Domain Path',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Network' => 'Network',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'RequiresWP' => 'Requires at least',
+ 'RequiresPHP' => 'Requires PHP',
</ins><span class="cx" style="display: block; padding: 0 10px"> // Site Wide Only is deprecated in favor of Network.
</span><span class="cx" style="display: block; padding: 0 10px"> '_sitewide' => 'Site Wide Only',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1085,6 +1092,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function validate_plugin_requirements( $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $readme_file = WP_PLUGIN_DIR . '/' . dirname( $plugin ) . '/readme.txt';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data = array(
+ 'requires' => '',
+ 'requires_php' => '',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $readme_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data = get_file_data(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,15 +1106,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- return true;
</del><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">+ $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
+
+ // Check for headers in the plugin's PHP file, give precedence to the plugin headers.
+ $plugin_data['requires'] = ! empty( $plugin_data['RequiresWP'] ) ? $plugin_data['RequiresWP'] : $plugin_data['requires'];
+ $plugin_data['requires_php'] = ! empty( $plugin_data['RequiresPHP'] ) ? $plugin_data['RequiresPHP'] : $plugin_data['requires_php'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['wp_compatible'] = is_wp_version_compatible( $plugin_data['requires'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['php_compatible'] = is_php_version_compatible( $plugin_data['requires_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">- $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin_data['wp_compatible'] && ! $plugin_data['php_compatible'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_wp_php_incompatible',
</span></span></pre>
</div>
</div>
</body>
</html>