WordPress 4.5-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-plugin-install-list-table.php

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 ba8445c1bdd02d2478c6868dceff89f76d508385..26c8a0a21bffa55d540d97a28526ea645cb4fe53 100644 (file)
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -86,15 +86,15 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                $tabs = array();
 
                if ( 'search' === $tab ) {
-                       $tabs['search'] = __( 'Search Results' );
+                       $tabs['search'] = __( 'Search Results' );
                }
-               $tabs['featured']  = _x( 'Featured', 'Plugin Installer' );
-               $tabs['popular']   = _x( 'Popular', 'Plugin Installer' );
-               $tabs['recommended']   = _x( 'Recommended', 'Plugin Installer' );
-               $tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
                if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
-                       $tabs['beta']      = _x( 'Beta Testing', 'Plugin Installer' );
+                       $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
                }
+               $tabs['featured']    = _x( 'Featured', 'Plugin Installer' );
+               $tabs['popular']     = _x( 'Popular', 'Plugin Installer' );
+               $tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
+               $tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
                if ( current_user_can( 'upload_plugins' ) ) {
                        // No longer a real tab. Here for filter compatibility.
                        // Gets skipped in get_views().
@@ -170,8 +170,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                break;
 
                        case 'favorites':
-                               $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-                               update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                               $action = 'save_wporg_username_' . get_current_user_id();
+                               if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
+                                       $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
+                                       update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+                               } else {
+                                       $user = get_user_option( 'wporg_favorites' );
+                               }
                                if ( $user )
                                        $args['user'] = $user;
                                else
@@ -461,13 +466,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                        case 'update_available':
                                                if ( $status['url'] ) {
                                                        /* translators: 1: Plugin name and version */
-                                                       $action_links[] = '<a class="update-now button" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+                                                       $action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
                                                }
 
                                                break;
                                        case 'latest_installed':
                                        case 'newer_installed':
-                                               $action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+                                               $action_links[] = '<span class="button button-disabled">' . _x( 'Installed', 'plugin' ) . '</span>';
                                                break;
                                }
                        }
@@ -476,7 +481,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                                                                '&amp;TB_iframe=true&amp;width=600&amp;height=550' );
 
                        /* translators: 1: Plugin name and version. */
-                       $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+                       $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
 
                        if ( !empty( $plugin['icons']['svg'] ) ) {
                                $plugin_icon_url = $plugin['icons']['svg'];
@@ -498,14 +503,13 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                         */
                        $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
 
-                       $date_format = __( 'M j, Y @ H:i' );
                        $last_updated_timestamp = strtotime( $plugin['last_updated'] );
                ?>
                <div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
                        <div class="plugin-card-top">
                                <div class="name column-name">
                                        <h3>
-                                               <a href="<?php echo esc_url( $details_link ); ?>" class="thickbox">
+                                               <a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
                                                <?php echo $title; ?>
                                                <img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
                                                </a>
@@ -526,12 +530,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
                        <div class="plugin-card-bottom">
                                <div class="vers column-rating">
                                        <?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
-                                       <span class="num-ratings">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+                                       <span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
                                </div>
                                <div class="column-updated">
-                                       <strong><?php _e( 'Last Updated:' ); ?></strong> <span title="<?php echo esc_attr( date_i18n( $date_format, $last_updated_timestamp ) ); ?>">
-                                               <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
-                                       </span>
+                                       <strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
                                </div>
                                <div class="column-downloaded">
                                        <?php