Ticket #46599: 46599.3.diff

wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -502 +502 @@
                                 $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
                         }
 
-                        $wp_version = get_bloginfo( 'version' );
+                        $wp_version   = get_bloginfo( 'version' );
+                        $requires_php = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null;
+                        $requires_wp  = isset( $plugin['requires'] ) ? $plugin['requires'] : null;
 
-                        $compatible_php = ( empty( $plugin['requires_php'] ) || version_compare( phpversion(), $plugin['requires_php'], '>=' ) );
+                        $compatible_php = is_php_compatible( $requires_php );
+                        $compatible_wp  = is_wp_compatible( $requires_wp );
                         $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();
 

wp-admin/includes/class-wp-plugins-list-table.php

@@ -761 +761 @@
 
                 }
 
-                $compatible_php = ( empty( $plugin_data['requires_php'] ) || version_compare( phpversion(), $plugin_data['requires_php'], '>=' ) );
+                $requires_php   = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null;
+                $compatible_php = is_php_compatible( $requires_php );
                 $class          = $is_active ? 'active' : 'inactive';
                 $checkbox_id    = 'checkbox_' . md5( $plugin_data['Name'] );
                 if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) || ! $compatible_php ) {

wp-admin/includes/plugin-install.php

@@ -754 +754 @@
         </div>
         <div id="section-holder" class="wrap">
         <?php
-        $wp_version = get_bloginfo( 'version' );
+        $wp_version   = get_bloginfo( 'version' );
+        $requires_php = isset( $api->requires_php ) ? $api->requires_php : null;
+        $requires_wp  = isset( $api->requires ) ? $api->requires : null;
 
-        $compatible_php = ( empty( $api->requires_php ) || version_compare( phpversion(), $api->requires_php, '>=' ) );
+        $compatible_php = is_php_compatible( $requires_php );
+        $compatible_wp  = is_wp_compatible( $requires_wp );
         $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 '<div class="notice notice-error notice-alt"><p>';

wp-admin/includes/plugin.php

@@ -1090 +1090 @@
                 return true;
         }
 
-        $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['wp_compatible']  = is_wp_compatible( $plugin_data['requires'] );
+        $plugin_data['php_compatible'] = is_php_compatible( $plugin_data['requires_php'] );
 
         $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );
 

wp-admin/includes/update.php

@@ -400 +400 @@
                         $active_class = is_plugin_active( $file ) ? ' active' : '';
                 }
 
-                $compatible_php = ( empty( $response->requires_php ) || version_compare( phpversion(), $response->requires_php, '>=' ) );
+                $requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
+                $compatible_php = is_php_compatible( $requires_php );
                 $notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
 
                 echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $response->slug . '-update' ) . '" data-slug="' . esc_attr( $response->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice inline ' . $notice_type . ' notice-alt"><p>';

wp-admin/update-core.php

@@ -295 +295 @@
                         }
                 }
 
-                $compatible_php = ( empty( $plugin_data->update->requires_php ) || version_compare( phpversion(), $plugin_data->update->requires_php, '>=' ) );
+                $requires_php   = isset( $plugin_data->update->requires_php ) ? $plugin_data->update->requires_php : null;
+                $compatible_php = is_php_compatible( $requires_php );
 
                 if ( ! $compatible_php && current_user_can( 'update_php' ) ) {
                         $compat .= '<br>' . __( 'This update doesn&#8217;t work with your version of PHP.' ) . '&nbsp;';

wp-includes/functions.php

@@ -7004 +7004 @@
         );
         echo '</p>';
 }
+
+/**
+* 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 is_wp_compatible( $required ) {
+        return empty( $required ) || version_compare( get_bloginfo( '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 is_php_compatible( $required ) {
+    return empty( $required ) || version_compare( phpversion(), $required, '>=' );
+}