Ticket #44350: 44350.8.diff

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

@@ -504 +504 @@
 
                         $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();
 

src/wp-admin/includes/plugin-install.php

@@ -756 +756 @@
         <?php
         $wp_version = get_bloginfo( 'version' );
 
-        $compatible_php = ( empty( $api->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 '<div class="notice notice-error notice-alt"><p>';

src/wp-admin/update-core.php

@@ -287 +287 @@
                                 $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
                         }
                 }
+
+                $compatible_php = ( empty( $plugin_data->update->requires_php ) || version_compare(  phpversion(), $plugin_data->update->requires_php, '>=' ) );
+
+                if ( ! $compatible_php ) {
+                        $compat .= '<br>' . __( 'This update doesn&#8217;t work with your version of PHP.' ) . '&nbsp;';
+                        /* translators: %s: Updating PHP page URL */
+                        $compat .= sprintf(
+                                __( '<a href="%s">Learn more about updating PHP.</a>' ),
+                                esc_url( __( 'https://wordpress.org/support/update-php/' ) )
+                        );
+                }
+
                 // Get the upgrade notice for the new plugin version.
                 if ( isset( $plugin_data->update->upgrade_notice ) ) {
                         $upgrade_notice = '<br />' . strip_tags( $plugin_data->update->upgrade_notice );
@@ -308 +320 @@
                 ?>
         <tr>
                 <td class="check-column">
+                <?php if ( $compatible_php ) : ?>
                         <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
                         <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
                         <?php
-                                /* translators: %s: plugin name */
-                                printf(
-                                        __( 'Select %s' ),
-                                        $plugin_data->Name
-                                );
+                                /* translators: %s: plugin name */
+                                printf(
+                                __( 'Select %s' ),
+                                esc_attr( $plugin_data->Name )
+                                );
                         ?>
                         </label>
-                </td>
-                <td class="plugin-title"><p>
-                                <?php echo $icon; ?>
-                        <strong><?php echo $plugin_data->Name; ?></strong>
-                        <?php
-                        /* translators: 1: plugin version, 2: new version */
-                        printf(
-                                __( 'You have version %1$s installed. Update to %2$s.' ),
-                                $plugin_data->Version,
-                                $plugin_data->update->new_version
-                        );
-                                echo ' ' . $details . $compat . $upgrade_notice;
+                <?php endif; ?>
+                </td>
+                <td class="plugin-title"><p>
+                        <?php echo $icon; ?>
+                        <strong><?php echo esc_html( $plugin_data->Name ); ?></strong>
+                        <?php
+                        /* translators: 1: plugin version, 2: new version */
+                        printf(
+                                        __( 'You have version %1$s installed. Update to %2$s.' ),
+                                        esc_attr( $plugin_data->Version ),
+                                        esc_attr( $plugin_data->update->new_version )
+                                );
+                                echo ' ' . $details . $compat . $upgrade_notice;
                         ?>
                 </p></td>
         </tr>
-                        <?php
+        <?php
         }
         ?>
         </tbody>