Ticket #43992: 43992.19.diff
File 43992.19.diff, 6.1 KB (added by , 4 years ago) |
---|
-
wp-admin/includes/plugin.php
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 5873a33466..0de6788524 100644
a b 31 31 * Network: Optional. Specify "Network: true" to require that a plugin is activated 32 32 * across all sites in an installation. This will prevent a plugin from being 33 33 * activated on a single site when Multisite is enabled. 34 * Requires WP: Optional. Specify the minimum required WordPress version. 35 * Requires PHP: Optional. Specify the minimum required PHP version. 34 36 * * / # Remove the space to close comment 35 37 * 36 38 * Some users have issues with opening large files and manipulating the contents … … 46 48 * reading. 47 49 * 48 50 * @since 1.5.0 51 * @since 5.2.0 Added `RequiresWP` and `RequiresPHP`. 49 52 * 50 53 * @param string $plugin_file Absolute path to the main plugin file. 51 54 * @param bool $markup Optional. If the returned data should have HTML markup applied. … … 63 66 * @type string $TextDomain Plugin textdomain. 64 67 * @type string $DomainPath Plugins relative directory path to .mo files. 65 68 * @type bool $Network Whether the plugin can only be activated network-wide. 69 * @type string $RequiresWP Minimum required version of WordPress. 70 * @type string $RequiresPHP Minimum required version of PHP. 66 71 * } 67 72 */ 68 73 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { … … function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { 77 82 'TextDomain' => 'Text Domain', 78 83 'DomainPath' => 'Domain Path', 79 84 'Network' => 'Network', 85 'RequiresWP' => 'Requires WP', 86 'RequiresPHP' => 'Requires PHP', 80 87 // Site Wide Only is deprecated in favor of Network. 81 88 '_sitewide' => 'Site Wide Only', 82 89 ); … … function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup 213 220 return $plugin_data; 214 221 } 215 222 223 /** 224 * Return plugin data for validation with WP version and PHP version. 225 * 226 * Uses get_file_data() to parse local readme.txt. 227 * Valid data in readme.txt takes priority. 228 * If valid data is not in readme.txt check if plugin header `Requires WP` or `Requires PHP` exists and use that. 229 * 230 * @since 5.2.0 231 * @see validate_plugin_requirements() 232 * 233 * @param string $plugin_file Path to the plugin file relative to the plugins directory. 234 * 235 * @return array $plugin_data Array of plugin data for validation. 236 */ 237 function get_plugin_validation_data( $plugin_file ) { 238 $validation_headers = array( 239 'requires' => 'requires at least', 240 'requires_php' => 'requires php', 241 ); 242 $plugin_data = null; 243 $readme_file = WP_PLUGIN_DIR . '/' . dirname( $plugin_file ) . '/readme.txt'; 244 if ( file_exists( $readme_file ) ) { 245 $plugin_data = get_file_data( $readme_file, $validation_headers ); 246 } 247 248 $plugin_data['file'] = $plugin_file; 249 250 // Plugin might have `Requires WP` and/or `Requires PHP` headers we can use. 251 $plugin_headers = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin_file, false, false ); 252 253 $plugin_data['requires'] = empty( $plugin_data['requires'] ) ? $plugin_headers['RequiresWP'] : $plugin_data['requires']; 254 $plugin_data['requires_php'] = empty( $plugin_data['requires_php'] ) ? $plugin_headers['RequiresPHP'] : $plugin_data['requires_php']; 255 256 return $plugin_data; 257 } 258 216 259 /** 217 260 * Get a list of a plugin's files. 218 261 * … … function is_network_only_plugin( $plugin ) { 595 638 * ensure that the success redirection will update the error redirection. 596 639 * 597 640 * @since 2.5.0 641 * @since 5.2.0 Test for WordPress version and PHP version compatibility. 598 642 * 599 643 * @param string $plugin Path to the plugin file relative to the plugins directory. 600 644 * @param string $redirect Optional. URL to redirect to. … … function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen 619 663 return $valid; 620 664 } 621 665 666 if ( ! validate_plugin_requirements( $plugin ) ) { 667 return new WP_Error( 'unmet_requirements', __( 'Plugin does not meet minimum WordPress and/or PHP requirements.' ) ); 668 } 669 622 670 if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) { 623 671 if ( ! empty( $redirect ) ) { 624 672 wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) ); // we'll override this later if the plugin can be included without fatal error … … function validate_plugin( $plugin ) { 1058 1106 return 0; 1059 1107 } 1060 1108 1109 /** 1110 * Validate the plugin requirements for WP version and PHP version. 1111 * 1112 * @since 5.2.0 1113 * @see activate_plugin() 1114 * 1115 * @param string $plugin Path to the plugin file relative to the plugins directory. 1116 * 1117 * @return bool Default to true and if requirements met, false if not. 1118 */ 1119 function validate_plugin_requirements( $plugin ) { 1120 $plugin_data = get_plugin_validation_data( $plugin ); 1121 $wp_requires = isset( $plugin_data['requires'] ) ? $plugin_data['requires'] : null; 1122 $php_requires = isset( $plugin_data['requires_php'] ) ? $plugin_data['requires_php'] : null; 1123 1124 return wp_is_wp_compatible( $wp_requires ) && wp_is_php_compatible( $php_requires ); 1125 } 1126 1061 1127 /** 1062 1128 * Whether the plugin can be uninstalled. 1063 1129 * -
wp-includes/functions.php
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 86cdabe7e0..cf7288ae94 100644
a b function wp_direct_php_update_button() { 6897 6897 ); 6898 6898 echo '</p>'; 6899 6899 } 6900 6901 /** 6902 * Check compatibility with current WordPress version. 6903 * 6904 * @since 5.2.0 6905 * 6906 * @param string $requires Minimum WordPress version from API. 6907 * 6908 * @return bool True if is compatible or empty, false if not. 6909 */ 6910 function wp_is_wp_compatible( $requires ) { 6911 $wp_version = get_bloginfo( 'version' ); 6912 return empty( $requires ) || version_compare( $wp_version, $requires, '>=' ); 6913 } 6914 6915 /** 6916 * Check compatibility with current PHP version. 6917 * 6918 * @since 5.2.0 6919 * 6920 * @param string $requires Minimum PHP version from API. 6921 * 6922 * @return bool True if is compatible or empty, false if not. 6923 */ 6924 function wp_is_php_compatible( $requires ) { 6925 return empty( $requires ) || version_compare( phpversion(), $requires, '>=' ); 6926 }