diff --git src/wp-admin/css/list-tables-rtl.css src/wp-admin/css/list-tables-rtl.css index 468dcbf8a1..5a1b371c4e 100644 --- src/wp-admin/css/list-tables-rtl.css +++ src/wp-admin/css/list-tables-rtl.css @@ -1510,10 +1510,31 @@ div.action-links, content: "\f158"; } +.plugin-card .column-compatibility .compatibility-incompatible:before { + color: #f00; +} + .plugin-card .compatibility-compatible:before { content: "\f147"; } +.plugin-card .column-compatibility .compatibility-compatible:before { + color: #008000; +} + +.plugin-card-incompatible { + color: #fff; + background-color:#C62D2D; + border: 1px solid #B02828; + padding: 10px; + margin: -12px -20px; +} + +.plugin-card-incompatible a { + color: #fff; + text-decoration: underline; +} + .plugin-icon { position: absolute; top: 20px; diff --git src/wp-admin/css/list-tables.css src/wp-admin/css/list-tables.css index 8d78983993..55fa10cc06 100644 --- src/wp-admin/css/list-tables.css +++ src/wp-admin/css/list-tables.css @@ -1510,10 +1510,31 @@ div.action-links, content: "\f158"; } +.plugin-card .column-compatibility .compatibility-incompatible:before { + color: #f00; +} + .plugin-card .compatibility-compatible:before { content: "\f147"; } +.plugin-card .column-compatibility .compatibility-compatible:before { + color: #008000; +} + +.plugin-card-incompatible { + color: #fff; + background-color:#C62D2D; + border: 1px solid #B02828; + padding: 10px; + margin: -12px -20px; +} + +.plugin-card-incompatible a { + color: #fff; + text-decoration: underline; +} + .plugin-icon { position: absolute; top: 20px; diff --git src/wp-admin/includes/class-wp-plugin-install-list-table.php src/wp-admin/includes/class-wp-plugin-install-list-table.php index a19729b1d4..cf3b5e781c 100644 --- src/wp-admin/includes/class-wp-plugin-install-list-table.php +++ src/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -496,6 +496,14 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { $author = ' ' . sprintf( __( 'By %s' ), $author ) . ''; } + $wp_version = get_bloginfo( 'version' ); + + $tested_php = ! empty( $plugin['requires_php'] ); + $compatible_php = ( ! $tested_php || version_compare( substr( PHP_VERSION, 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'], '>=' ) ); + $can_install = ( ! $tested_php || $compatible_php ) && $compatible_wp; + $action_links = array(); if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) { @@ -504,15 +512,22 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { switch ( $status['status'] ) { case 'install': if ( $status['url'] ) { - $action_links[] = sprintf( - '%s', - esc_attr( $plugin['slug'] ), - esc_url( $status['url'] ), - /* translators: %s: plugin name and version */ - esc_attr( sprintf( __( 'Install %s now' ), $name ) ), - esc_attr( $name ), - __( 'Install Now' ) - ); + if ( $can_install ) { + $action_links[] = sprintf( + '%s', + esc_attr( $plugin['slug'] ), + esc_url( $status['url'] ), + /* translators: %s: plugin name and version */ + esc_attr( sprintf( __( 'Install %s now' ), $name ) ), + esc_attr( $name ), + __( 'Install Now' ) + ); + } else { + $action_links[] = sprintf( + '', + _x( 'Cannot Install', 'plugin' ) + ); + } } break; @@ -632,7 +647,37 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
-
+ '; + + // Remove this section for commit. + echo ''; + // End remove for commit. + + echo ' '; + _e( 'This plugin is incompatible and cannot be installed.' ); + echo ' '; + printf( + '%s', + esc_url( $details_link ), + /* translators: %s: plugin name and version */ + esc_attr( sprintf( __( 'More information about %s' ), $name ) ), + esc_attr( $name ), + __( 'Why?' ) + ); + echo '
'; + continue; + } ?> +
$plugin['num_ratings'], ) ); -?> + ?>
@@ -664,17 +709,6 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { ?>
- ' ) ) { - echo '' . __( 'Untested with your version of WordPress' ) . ''; - } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) { - echo '' . __( 'Incompatible with your version of WordPress' ) . ''; - } else { - echo '' . __( 'Compatible with your version of WordPress' ) . ''; - } - ?>
diff --git src/wp-admin/includes/plugin-install.php src/wp-admin/includes/plugin-install.php index f765fb286e..da187ed07f 100644 --- src/wp-admin/includes/plugin-install.php +++ src/wp-admin/includes/plugin-install.php @@ -753,10 +753,23 @@ if ( ! empty( $api->contributors ) ) { tested ) && version_compare( substr( $wp_version, 0, strlen( $api->tested ) ), $api->tested, '>' ) ) { - echo '

' . __( 'Warning: This plugin has not been tested with your current version of WordPress.' ) . '

'; - } elseif ( ! empty( $api->requires ) && version_compare( substr( $wp_version, 0, strlen( $api->requires ) ), $api->requires, '<' ) ) { - echo '

' . __( 'Warning: This plugin has not been marked as compatible with your version of WordPress.' ) . '

'; + $tested_php = ! empty( $api->requires_php ); + $compatible_php = ( ! $tested_php || version_compare( substr( PHP_VERSION, 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, '>=' ) ); + $can_install = ( ! $tested_php || $compatible_php ) && $compatible_wp; + + if ( ! $compatible_php && $tested_php ) { + echo '

' . sprintf( + /* translators: Upgrading PHP page URL */ + __( 'Error: This plugin requires a newer version of PHP, so unfortunately you cannot install it. Click here to learn more about upgrading PHP.' ), + esc_url( __( 'https://wordpress.org/support/upgrade-php/' ) ) + ) . '

'; + } + if ( ! $tested_wp ) { + echo '

' . __( 'Warning: This plugin has not been tested with your current version of WordPress.' ) . '

'; + } elseif ( ! $compatible_wp ) { + echo '

' . __( 'Error: This plugin has not been marked as compatible with your version of WordPress.' ) . '

'; } foreach ( (array) $api->sections as $section_name => $content ) { @@ -779,8 +792,13 @@ if ( ! empty( $api->contributors ) ) { $status = install_plugin_install_status( $api ); switch ( $status['status'] ) { case 'install': - if ( $status['url'] ) { + if ( $can_install ) { echo '' . __( 'Install Now' ) . ''; + } else { + printf( + '', + _x( 'Cannot Install', 'plugin' ) + ); } break; case 'update_available':