From 50bb3c689f5ea86bbe3aaa96889f92cf3993e651 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 22 Mar 2019 13:00:52 +0000 Subject: [PATCH] Plugins: Remove `wp_is_wp_compatible()` and `wp_is_php_compatible()` functions added in [44978] for now, to discuss use cases and better naming. See #46599, #43992. Built from https://develop.svn.wordpress.org/trunk@44981 git-svn-id: http://core.svn.wordpress.org/trunk@44812 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 4 ++-- wp-includes/functions.php | 26 -------------------------- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 2db58a7c15..23bc994749 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -1090,8 +1090,8 @@ function validate_plugin_requirements( $plugin ) { return true; } - $plugin_data['wp_compatible'] = wp_is_wp_compatible( $plugin_data['requires'] ); - $plugin_data['php_compatible'] = wp_is_php_compatible( $plugin_data['requires_php'] ); + $plugin_data['wp_compatible'] = version_compare( get_bloginfo( 'version' ), $plugin_data['requires'], '>=' ); + $plugin_data['php_compatible'] = version_compare( phpversion(), $plugin_data['requires_php'], '>=' ); $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index b8a0a7db07..86cdabe7e0 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -6897,29 +6897,3 @@ function wp_direct_php_update_button() { ); echo '

'; } - -/** - * Checks compatibility with the current WordPress version. - * - * @since 5.2.0 - * - * @param string $required Minimum required WordPress version. - * @return bool True if required version is compatible or empty, false if not. - */ -function wp_is_wp_compatible( $required ) { - $wp_version = get_bloginfo( 'version' ); - - return empty( $required ) || version_compare( $wp_version, $required, '>=' ); -} - -/** - * Checks compatibility with the current PHP version. - * - * @since 5.2.0 - * - * @param string $required Minimum required PHP version. - * @return bool True if required version is compatible or empty, false if not. - */ -function wp_is_php_compatible( $required ) { - return empty( $required ) || version_compare( phpversion(), $required, '>=' ); -} diff --git a/wp-includes/version.php b/wp-includes/version.php index 897b2fad7b..6d7a63efa8 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-alpha-44980'; +$wp_version = '5.2-alpha-44981'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.