Ticket #46938: 46938.diff

wp-admin/includes/plugin.php

@@ -31 +31 @@
  *     Network: Optional. Specify "Network: true" to require that a plugin is activated
  *          across all sites in an installation. This will prevent a plugin from being
  *          activated on a single site when Multisite is enabled.
+ *     Requires WP: Optional. Specify the minimum required WordPress version.
+ *     Requires PHP: Optional. Specify the minimum required PHP version.
  *      * / # Remove the space to close comment
  *
  * Some users have issues with opening large files and manipulating the contents
@@ -46 +48 @@
  * reading.
  *
  * @since 1.5.0
+ * @since 5.3.0 Added `RequiresWP` and `RequiresPHP`.
  *
  * @param string $plugin_file Absolute path to the main plugin file.
  * @param bool   $markup      Optional. If the returned data should have HTML markup applied.
@@ -63 +66 @@
  *     @type string $TextDomain  Plugin textdomain.
  *     @type string $DomainPath  Plugins relative directory path to .mo files.
  *     @type bool   $Network     Whether the plugin can only be activated network-wide.
+ *     @type string $RequiresWP  Minimum required version of WordPress.
+ *     @type string $RequiresPHP Minimum required version of PHP.
  * }
  */
 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
@@ -77 +82 @@
                 'TextDomain'  => 'Text Domain',
                 'DomainPath'  => 'Domain Path',
                 'Network'     => 'Network',
+                'RequiresWP'  => 'Requires WP',
+                'RequiresPHP' => 'Requires PHP',
                 // Site Wide Only is deprecated in favor of Network.
                 '_sitewide'   => 'Site Wide Only',
         );
@@ -1085 +1092 @@
  */
 function validate_plugin_requirements( $plugin ) {
         $readme_file = WP_PLUGIN_DIR . '/' . dirname( $plugin ) . '/readme.txt';
+        $plugin_data = array();
 
         if ( file_exists( $readme_file ) ) {
                 $plugin_data = get_file_data(
@@ -1095 +1103 @@
                         ),
                         'plugin'
                 );
-        } else {
-                return true;
         }
 
+        $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
+
+        // Check for headers in plugin file, precedence to headers in readme.txt file.
+        $plugin_data['requires']     = isset( $plugin_data['requires'] ) ? $plugin_data['requires'] : $plugin_data['RequiresWP'];
+        $plugin_data['requires_php'] = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : $plugin_data['RequiresPHP'];
+
         $plugin_data['wp_compatible']  = is_wp_version_compatible( $plugin_data['requires'] );
         $plugin_data['php_compatible'] = is_php_version_compatible( $plugin_data['requires_php'] );
 
-        $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
-
         if ( ! $plugin_data['wp_compatible'] && ! $plugin_data['php_compatible'] ) {
                 return new WP_Error(
                         'plugin_wp_php_incompatible',