From 9f2d529a770a1dad2453ed73232d49d0d9cc88aa Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Sun, 20 Jan 2019 12:03:53 +0000 Subject: [PATCH] Upgrade/Install: Make `version_compare()` calls for plugin required version checks more robust. Props afragen. Fixes #46024. See #43986. Built from https://develop.svn.wordpress.org/trunk@44656 git-svn-id: http://core.svn.wordpress.org/trunk@44487 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-plugin-install-list-table.php | 6 +++--- wp-admin/includes/plugin-install.php | 6 +++--- wp-includes/version.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index 03c7e81c47..3ff7991fc5 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -504,9 +504,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { $wp_version = get_bloginfo( 'version' ); - $compatible_php = ( empty( $plugin['requires_php'] ) || version_compare( substr( phpversion(), 0, strlen( $plugin['requires_php'] ) ), $plugin['requires_php'], '>=' ) ); - $tested_wp = ( empty( $plugin['tested'] ) || version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '<=' ) ); - $compatible_wp = ( empty( $plugin['requires'] ) || version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '>=' ) ); + $compatible_php = ( empty( $plugin['requires_php'] ) || version_compare( phpversion(), $plugin['requires_php'], '>=' ) ); + $tested_wp = ( empty( $plugin['tested'] ) || version_compare( $wp_version, $plugin['tested'], '<=' ) ); + $compatible_wp = ( empty( $plugin['requires'] ) || version_compare( $wp_version, $plugin['requires'], '>=' ) ); $action_links = array(); diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 92fdad384d..f2607cb9ef 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -756,9 +756,9 @@ function install_plugin_information() { requires_php ) || version_compare( substr( phpversion(), 0, strlen( $api->requires_php ) ), $api->requires_php, '>=' ) ); - $tested_wp = ( empty( $api->tested ) || version_compare( substr( $wp_version, 0, strlen( $api->tested ) ), $api->tested, '<=' ) ); - $compatible_wp = ( empty( $api->requires ) || version_compare( substr( $wp_version, 0, strlen( $api->requires ) ), $api->requires, '>=' ) ); + $compatible_php = ( empty( $api->requires_php ) || version_compare( phpversion(), $api->requires_php, '>=' ) ); + $tested_wp = ( empty( $api->tested ) || version_compare( $wp_version, $api->tested, '<=' ) ); + $compatible_wp = ( empty( $api->requires ) || version_compare( $wp_version, $api->requires, '>=' ) ); if ( ! $compatible_php ) { echo '

'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 4960457431..f71a1ed233 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-beta1-44655'; +$wp_version = '5.1-beta1-44656'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.