Ticket #43986: 43986v3-1.diff
File 43986v3-1.diff, 7.2 KB (added by , 6 years ago) |
---|
-
src/wp-admin/includes/class-wp-plugin-install-list-table.php
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..f7958723eb 100644
class WP_Plugin_Install_List_Table extends WP_List_Table { 496 496 $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>'; 497 497 } 498 498 499 $wp_version = get_bloginfo( 'version' ); 500 501 $tested_php = ! empty( $plugin['requires_php'] ); 502 $compatible_php = ( ! $tested_php || version_compare( substr( PHP_VERSION, 0, strlen( $plugin['requires_php'] ) ), $plugin['requires_php'], '>=' ) ); 503 $tested_wp = ( empty( $plugin['tested'] ) || version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '<=' ) ); 504 $compatible_wp = ( empty( $plugin['requires'] ) || version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '>=' ) ); 505 $can_install = $compatible_php && $compatible_wp; 506 499 507 $action_links = array(); 500 508 501 509 if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) { … … class WP_Plugin_Install_List_Table extends WP_List_Table { 504 512 switch ( $status['status'] ) { 505 513 case 'install': 506 514 if ( $status['url'] ) { 507 $action_links[] = sprintf( 508 '<a class="install-now button" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>', 509 esc_attr( $plugin['slug'] ), 510 esc_url( $status['url'] ), 511 /* translators: %s: plugin name and version */ 512 esc_attr( sprintf( __( 'Install %s now' ), $name ) ), 513 esc_attr( $name ), 514 __( 'Install Now' ) 515 ); 515 if ( $can_install ) { 516 $action_links[] = sprintf( 517 '<a class="install-now button" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>', 518 esc_attr( $plugin['slug'] ), 519 esc_url( $status['url'] ), 520 /* translators: %s: plugin name and version */ 521 esc_attr( sprintf( __( 'Install %s now' ), $name ) ), 522 esc_attr( $name ), 523 __( 'Install Now' ) 524 ); 525 } else { 526 $action_links[] = sprintf( 527 '<button type="button" class="button button-disabled" disabled="disabled">%s</button>', 528 _x( 'Cannot Install', 'plugin' ) 529 ); 530 } 516 531 } 517 532 break; 518 533 … … class WP_Plugin_Install_List_Table extends WP_List_Table { 665 680 </div> 666 681 <div class="column-compatibility"> 667 682 <?php 668 $wp_version = get_bloginfo( 'version' ); 669 670 if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) { 683 if ( ! $tested_wp ) { 671 684 echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>'; 672 } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' )) {685 } elseif ( ! $compatible_wp ) { 673 686 echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>'; 674 687 } else { 675 688 echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>'; 676 689 } 690 if ( ! $tested_php ) { 691 echo '<br><span class="compatibility-untested">' . __( 'Untested with your version of PHP' ) . '</span>'; 692 } elseif ( ! $compatible_php ) { 693 echo '<br><span class="compatibility-incompatible">' . 694 __( '<strong>Incompatible</strong> with your version of PHP' ) . '</span>'; 695 } else { 696 echo '<br><span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of PHP' ) . '</span>'; 697 } 677 698 ?> 678 699 </div> 679 700 </div> -
src/wp-admin/includes/plugin-install.php
diff --git src/wp-admin/includes/plugin-install.php src/wp-admin/includes/plugin-install.php index f765fb286e..eea072209f 100644
if ( ! empty( $api->contributors ) ) { 753 753 <?php 754 754 $wp_version = get_bloginfo( 'version' ); 755 755 756 if ( ! empty( $api->tested ) && version_compare( substr( $wp_version, 0, strlen( $api->tested ) ), $api->tested, '>' ) ) { 757 echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.' ) . '</p></div>'; 758 } elseif ( ! empty( $api->requires ) && version_compare( substr( $wp_version, 0, strlen( $api->requires ) ), $api->requires, '<' ) ) { 759 echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.' ) . '</p></div>'; 756 757 $tested_php = ! empty( $api->requires_php ); 758 $compatible_php = ( ! $tested_php || version_compare( substr( PHP_VERSION, 0, strlen( $api->requires_php ) ), $api->requires_php, '>=' ) ); 759 $tested_wp = ( empty( $api->tested ) || version_compare( substr( $wp_version, 0, strlen( $api->tested ) ), $api->tested, '<=' ) ); 760 $compatible_wp = ( empty( $api->requires ) || version_compare( substr( $wp_version, 0, strlen( $api->requires ) ), $api->requires, '>=' ) ); 761 $can_install = $compatible_php && $compatible_wp; 762 763 if ( ! $tested_wp ) { 764 echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of WordPress.' ) . '</p></div>'; 765 } elseif ( ! $compatible_wp ) { 766 echo '<div class="notice notice-error notice-alt"><p>' . __( '<strong>Error:</strong> This plugin <strong>has not been marked as compatible</strong> with your version of WordPress.' ) . '</p></div>'; 767 } 768 if ( ! $tested_php ) { 769 echo '<div class="notice notice-warning notice-alt"><p>' . __( '<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of PHP.' ) . '</p></div>'; 770 } elseif ( ! $compatible_php ) { 771 echo '<div class="notice notice-error notice-alt"><p>' . sprintf( 772 /* translators: Upgrading PHP page URL */ 773 __( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>, so unfortunately you cannot install it. <a href="%s">Click here to learn more about upgrading PHP.</a>' ), 774 esc_url( __( 'https://wordpress.org/support/upgrade-php/' ) ) 775 ) . '</p></div>'; 760 776 } 761 777 762 778 foreach ( (array) $api->sections as $section_name => $content ) { … … if ( ! empty( $api->contributors ) ) { 779 795 $status = install_plugin_install_status( $api ); 780 796 switch ( $status['status'] ) { 781 797 case 'install': 782 if ( $ status['url']) {798 if ( $can_install ) { 783 799 echo '<a data-slug="' . esc_attr( $api->slug ) . '" id="plugin_install_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Now' ) . '</a>'; 800 } else { 801 printf( 802 '<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>', 803 _x( 'Cannot Install', 'plugin' ) 804 ); 784 805 } 785 806 break; 786 807 case 'update_available':