Ticket #38073: 38073.patch

src/wp-admin/comment.php

@@ -12 +12 @@
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
 
-/**
- * @global string $action
- */
-global $action;
-wp_reset_vars( array('action') );
+$action = wp_assign_request_var('action');
 
 if ( isset( $_POST['deletecomment'] ) )
-        $action = 'deletecomment';
+    $action = 'deletecomment';
 
 if ( 'cdc' == $action )
-        $action = 'delete';
+    $action = 'delete';
 elseif ( 'mac' == $action )
-        $action = 'approve';
+    $action = 'approve';
 
 if ( isset( $_GET['dt'] ) ) {
-        if ( 'spam' == $_GET['dt'] )
-                $action = 'spam';
-        elseif ( 'trash' == $_GET['dt'] )
-                $action = 'trash';
+    if ( 'spam' == $_GET['dt'] )
+        $action = 'spam';
+    elseif ( 'trash' == $_GET['dt'] )
+        $action = 'trash';
 }
 
 switch( $action ) {
 
 case 'editcomment' :
-        $title = __('Edit Comment');
+    $title = __('Edit Comment');
 
-        get_current_screen()->add_help_tab( array(
-                'id'      => 'overview',
-                'title'   => __('Overview'),
-                'content' =>
-                        '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-                        '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-        ) );
+    get_current_screen()->add_help_tab( array(
+        'id'      => 'overview',
+        'title'   => __('Overview'),
+        'content' =>
+            '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+            '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
+    ) );
 
-        get_current_screen()->set_help_sidebar(
-        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-        '<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-        '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
-        );
+    get_current_screen()->set_help_sidebar(
+    '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+    '<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
+    '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+    );
 
-        wp_enqueue_script('comment');
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    wp_enqueue_script('comment');
+    require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-        $comment_id = absint( $_GET['c'] );
+    $comment_id = absint( $_GET['c'] );
 
-        if ( !$comment = get_comment( $comment_id ) )
-                comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+    if ( !$comment = get_comment( $comment_id ) )
+        comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
 
-        if ( !current_user_can( 'edit_comment', $comment_id ) )
-                comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+    if ( !current_user_can( 'edit_comment', $comment_id ) )
+        comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
 
-        if ( 'trash' == $comment->comment_approved )
-                comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+    if ( 'trash' == $comment->comment_approved )
+        comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
 
-        $comment = get_comment_to_edit( $comment_id );
+    $comment = get_comment_to_edit( $comment_id );
 
-        include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+    include( ABSPATH . 'wp-admin/edit-form-comment.php' );
 
-        break;
+    break;
 
 case 'delete'  :
 case 'approve' :
 case 'trash'   :
 case 'spam'    :
 
-        $title = __('Moderate Comment');
+    $title = __('Moderate Comment');
 
-        $comment_id = absint( $_GET['c'] );
+    $comment_id = absint( $_GET['c'] );
 
-        if ( ! $comment = get_comment( $comment_id ) ) {
-                wp_redirect( admin_url('edit-comments.php?error=1') );
-                die();
-        }
+    if ( ! $comment = get_comment( $comment_id ) ) {
+        wp_redirect( admin_url('edit-comments.php?error=1') );
+        die();
+    }
 
-        if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-                wp_redirect( admin_url('edit-comments.php?error=2') );
-                die();
-        }
+    if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+        wp_redirect( admin_url('edit-comments.php?error=2') );
+        die();
+    }
 
-        // No need to re-approve/re-trash/re-spam a comment.
-        if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-                wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-                die();
-        }
+    // No need to re-approve/re-trash/re-spam a comment.
+    if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+        wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+        die();
+     }
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-        $formaction    = $action . 'comment';
-        $nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
-        $nonce_action .= $comment_id;
+    $formaction    = $action . 'comment';
+    $nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
+    $nonce_action .= $comment_id;
 
 ?>
 <div class="wrap">
@@ -110 +106 @@
 
 <?php
 switch ( $action ) {
-        case 'spam' :
-                $caution_msg = __('You are about to mark the following comment as spam:');
-                $button      = _x( 'Mark as Spam', 'comment' );
-                break;
-        case 'trash' :
-                $caution_msg = __('You are about to move the following comment to the Trash:');
-                $button      = __('Move to Trash');
-                break;
-        case 'delete' :
-                $caution_msg = __('You are about to delete the following comment:');
-                $button      = __('Permanently Delete Comment');
-                break;
-        default :
-                $caution_msg = __('You are about to approve the following comment:');
-                $button      = __('Approve Comment');
-                break;
+    case 'spam' :
+        $caution_msg = __('You are about to mark the following comment as spam:');
+        $button      = _x( 'Mark as Spam', 'comment' );
+        break;
+    case 'trash' :
+        $caution_msg = __('You are about to move the following comment to the Trash:');
+        $button      = __('Move to Trash');
+        break;
+    case 'delete' :
+        $caution_msg = __('You are about to delete the following comment:');
+        $button      = __('Permanently Delete Comment');
+        break;
+    default :
+        $caution_msg = __('You are about to approve the following comment:');
+        $button      = __('Approve Comment');
+        break;
 }
 
 if ( $comment->comment_approved != '0' ) { // if not unapproved
-        $message = '';
-        switch ( $comment->comment_approved ) {
-                case '1' :
-                        $message = __('This comment is currently approved.');
-                        break;
-                case 'spam' :
-                        $message  = __('This comment is currently marked as spam.');
-                        break;
-                case 'trash' :
-                        $message  = __('This comment is currently in the Trash.');
-                        break;
-        }
-        if ( $message ) {
-                echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
-        }
+    $message = '';
+    switch ( $comment->comment_approved ) {
+        case '1' :
+            $message = __('This comment is currently approved.');
+            break;
+        case 'spam' :
+            $message  = __('This comment is currently marked as spam.');
+            break;
+        case 'trash' :
+            $message  = __('This comment is currently in the Trash.');
+            break;
+    }
+    if ( $message ) {
+        echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+    }
 }
 ?>
 <div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
@@ -166 +162 @@
 </tr>
 <?php } ?>
 <tr>
-        <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
-        <td>
-        <?php
-                $post_id = $comment->comment_post_ID;
-                if ( current_user_can( 'edit_post', $post_id ) ) {
-                        $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-                        $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
-                } else {
-                        $post_link = esc_html( get_the_title( $post_id ) );
-                }
-                echo $post_link;
-
-                if ( $comment->comment_parent ) {
-                        $parent      = get_comment( $comment->comment_parent );
-                        $parent_link = esc_url( get_comment_link( $parent ) );
-                        $name        = get_comment_author( $parent );
-                        printf(
-                                /* translators: %s: comment link */
-                                ' | ' . __( 'In reply to %s.' ),
-                                '<a href="' . $parent_link . '">' . $name . '</a>'
-                        );
-                }
-        ?>
-        </td>
+    <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+    <td>
+    <?php
+        $post_id = $comment->comment_post_ID;
+        if ( current_user_can( 'edit_post', $post_id ) ) {
+            $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+            $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+        } else {
+            $post_link = esc_html( get_the_title( $post_id ) );
+        }
+        echo $post_link;
+
+        if ( $comment->comment_parent ) {
+            $parent      = get_comment( $comment->comment_parent );
+            $parent_link = esc_url( get_comment_link( $parent ) );
+            $name        = get_comment_author( $parent );
+            printf(
+                /* translators: %s: comment link */
+                ' | ' . __( 'In reply to %s.' ),
+                '<a href="' . $parent_link . '">' . $name . '</a>'
+            );
+        }
+    ?>
+    </td>
 </tr>
 <tr>
-        <th scope="row"><?php _e( 'Submitted on' ); ?></th>
-        <td>
-        <?php
-                /* translators: 1: comment date, 2: comment time */
-                $submitted = sprintf( __( '%1$s at %2$s' ),
-                        /* translators: comment date format. See https://secure.php.net/date */
-                        get_comment_date( __( 'Y/m/d' ), $comment ),
-                        get_comment_date( __( 'g:i a' ), $comment )
-                );
-                if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
-                        echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
-                } else {
-                        echo $submitted;
-                }
-        ?>
-        </td>
+    <th scope="row"><?php _e( 'Submitted on' ); ?></th>
+    <td>
+    <?php
+        /* translators: 1: comment date, 2: comment time */
+        $submitted = sprintf( __( '%1$s at %2$s' ),
+            /* translators: comment date format. See https://secure.php.net/date */
+            get_comment_date( __( 'Y/m/d' ), $comment ),
+            get_comment_date( __( 'g:i a' ), $comment )
+        );
+        if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+            echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+        } else {
+            echo $submitted;
+        }
+    ?>
+    </td>
 </tr>
 <tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td class="comment-content">
-        <?php comment_text( $comment ); ?>
-        <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
+    <?php comment_text( $comment ); ?>
+    <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
 </td>
 </tr>
 </table>
@@ -221 +217 @@
 <form action="comment.php" method="get" class="comment-ays-submit">
 
 <p>
-        <?php submit_button( $button, 'primary', 'submit', false ); ?>
-        <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+    <?php submit_button( $button, 'primary', 'submit', false ); ?>
+    <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
 </p>
 
 <?php wp_nonce_field( $nonce_action ); ?>
@@ -233 +229 @@
 
 </div>
 <?php
-        break;
+    break;
 
 case 'deletecomment'    :
 case 'trashcomment'     :
@@ -242 +238 @@
 case 'unspamcomment'    :
 case 'approvecomment'   :
 case 'unapprovecomment' :
-        $comment_id = absint( $_REQUEST['c'] );
-
-        if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-                check_admin_referer( 'approve-comment_' . $comment_id );
-        else
-                check_admin_referer( 'delete-comment_' . $comment_id );
-
-        $noredir = isset($_REQUEST['noredir']);
-
-        if ( !$comment = get_comment($comment_id) )
-                comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-        if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-                comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
-
-        if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-                $redir = wp_get_referer();
-        elseif ( '' != wp_get_original_referer() && ! $noredir )
-                $redir = wp_get_original_referer();
-        elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-                $redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-        else
-                $redir = admin_url('edit-comments.php');
-
-        $redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
-
-        switch ( $action ) {
-                case 'deletecomment' :
-                        wp_delete_comment( $comment );
-                        $redir = add_query_arg( array('deleted' => '1'), $redir );
-                        break;
-                case 'trashcomment' :
-                        wp_trash_comment( $comment );
-                        $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
-                        break;
-                case 'untrashcomment' :
-                        wp_untrash_comment( $comment );
-                        $redir = add_query_arg( array('untrashed' => '1'), $redir );
-                        break;
-                case 'spamcomment' :
-                        wp_spam_comment( $comment );
-                        $redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
-                        break;
-                case 'unspamcomment' :
-                        wp_unspam_comment( $comment );
-                        $redir = add_query_arg( array('unspammed' => '1'), $redir );
-                        break;
-                case 'approvecomment' :
-                        wp_set_comment_status( $comment, 'approve' );
-                        $redir = add_query_arg( array( 'approved' => 1 ), $redir );
-                        break;
-                case 'unapprovecomment' :
-                        wp_set_comment_status( $comment, 'hold' );
-                        $redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
-                        break;
-        }
-
-        wp_redirect( $redir );
-        die;
+    $comment_id = absint( $_REQUEST['c'] );
+
+    if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
+        check_admin_referer( 'approve-comment_' . $comment_id );
+    else
+        check_admin_referer( 'delete-comment_' . $comment_id );
+
+    $noredir = isset($_REQUEST['noredir']);
+
+    if ( !$comment = get_comment($comment_id) )
+        comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+    if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+        comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+
+    if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+        $redir = wp_get_referer();
+    elseif ( '' != wp_get_original_referer() && ! $noredir )
+        $redir = wp_get_original_referer();
+    elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
+        $redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+    else
+        $redir = admin_url('edit-comments.php');
+
+    $redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+
+    switch ( $action ) {
+        case 'deletecomment' :
+            wp_delete_comment( $comment );
+            $redir = add_query_arg( array('deleted' => '1'), $redir );
+            break;
+        case 'trashcomment' :
+            wp_trash_comment( $comment );
+            $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+            break;
+        case 'untrashcomment' :
+            wp_untrash_comment( $comment );
+            $redir = add_query_arg( array('untrashed' => '1'), $redir );
+            break;
+        case 'spamcomment' :
+            wp_spam_comment( $comment );
+            $redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+            break;
+        case 'unspamcomment' :
+            wp_unspam_comment( $comment );
+            $redir = add_query_arg( array('unspammed' => '1'), $redir );
+            break;
+        case 'approvecomment' :
+            wp_set_comment_status( $comment, 'approve' );
+            $redir = add_query_arg( array( 'approved' => 1 ), $redir );
+            break;
+        case 'unapprovecomment' :
+            wp_set_comment_status( $comment, 'hold' );
+            $redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+            break;
+    }
+
+    wp_redirect( $redir );
+    die;
 
 case 'editedcomment' :
 
-        $comment_id = absint( $_POST['comment_ID'] );
-        $comment_post_id = absint( $_POST['comment_post_ID'] );
+    $comment_id = absint( $_POST['comment_ID'] );
+    $comment_post_id = absint( $_POST['comment_post_ID'] );
 
-        check_admin_referer( 'update-comment_' . $comment_id );
+    check_admin_referer( 'update-comment_' . $comment_id );
 
-        edit_comment();
+    edit_comment();
 
-        $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+    $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
 
-        /**
-         * Filters the URI the user is redirected to after editing a comment in the admin.
-         *
-         * @since 2.1.0
-         *
-         * @param string $location The URI the user will be redirected to.
-         * @param int $comment_id The ID of the comment being edited.
-         */
-        $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-        wp_redirect( $location );
+    /**
+     * Filters the URI the user is redirected to after editing a comment in the admin.
+     *
+     * @since 2.1.0
+     *
+     * @param string $location The URI the user will be redirected to.
+     * @param int $comment_id The ID of the comment being edited.
+     */
+    $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+    wp_redirect( $location );
 
-        exit();
+    exit();
 
 default:
-        wp_die( __('Unknown action.') );
+    wp_die( __('Unknown action.') );
 
 } // end switch
 

src/wp-admin/customize.php

@@ -13 +13 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! current_user_can( 'customize' ) ) {
-        wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
-                403
-        );
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
+        403
+    );
 }
 
 /**
@@ -27 +27 @@
 global $wp_scripts, $wp_customize;
 
 if ( $wp_customize->changeset_post_id() ) {
-        if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() ) ) {
-                wp_die(
-                        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                        '<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
-                        403
-                );
-        }
-        if ( in_array( get_post_status( $wp_customize->changeset_post_id() ), array( 'publish', 'trash' ), true ) ) {
-                wp_die(
-                        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                        '<p>' . __( 'This changeset has already been published and cannot be further modified.' ) . '</p>' .
-                        '<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
-                        403
-                );
-        }
+    if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
+            403
+        );
+    }
+    if ( in_array( get_post_status( $wp_customize->changeset_post_id() ), array( 'publish', 'trash' ), true ) ) {
+        wp_die(
+            '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+            '<p>' . __( 'This changeset has already been published and cannot be further modified.' ) . '</p>' .
+            '<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
+            403
+        );
+    }
 }
 
-
-wp_reset_vars( array( 'url', 'return', 'autofocus' ) );
+$url = wp_assign_request_var('url');
 if ( ! empty( $url ) ) {
-        $wp_customize->set_preview_url( wp_unslash( $url ) );
+    $wp_customize->set_preview_url( wp_unslash( $url ) );
 }
+
+$return = wp_assign_request_var('return');
 if ( ! empty( $return ) ) {
-        $wp_customize->set_return_url( wp_unslash( $return ) );
+    $wp_customize->set_return_url( wp_unslash( $return ) );
 }
+
+$autofocus = wp_assign_request_var('autofocus');
 if ( ! empty( $autofocus ) && is_array( $autofocus ) ) {
-        $wp_customize->set_autofocus( wp_unslash( $autofocus ) );
+    $wp_customize->set_autofocus( wp_unslash( $autofocus ) );
 }
 
 $registered = $wp_scripts->registered;
@@ -90 +93 @@
 $body_class = 'wp-core-ui wp-customizer js';
 
 if ( wp_is_mobile() ) :
-        $body_class .= ' mobile';
+    $body_class .= ' mobile';
 
-        ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
+    ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
 endif;
 
 if ( $wp_customize->is_ios() ) {
-        $body_class .= ' ios';
+    $body_class .= ' ios';
 }
 
 if ( is_rtl() ) {
-        $body_class .= ' rtl';
+    $body_class .= ' rtl';
 }
 $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
@@ -130 +133 @@
 </head>
 <body class="<?php echo esc_attr( $body_class ); ?>">
 <div class="wp-full-overlay expanded">
-        <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
-                <div id="customize-header-actions" class="wp-full-overlay-header">
-                        <?php
-                        $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-                        $save_attrs = array();
-                        if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts ) ) {
-                                $save_attrs['style'] = 'display: none';
-                        }
-                        submit_button( $save_text, 'primary save', 'save', false, $save_attrs );
-                        ?>
-                        <span class="spinner"></span>
-                        <button type="button" class="customize-controls-preview-toggle">
-                                <span class="controls"><?php _e( 'Customize' ); ?></span>
-                                <span class="preview"><?php _e( 'Preview' ); ?></span>
-                        </button>
-                        <a class="customize-controls-close" href="<?php echo esc_url( $wp_customize->get_return_url() ); ?>">
-                                <span class="screen-reader-text"><?php _e( 'Close the Customizer and go back to the previous page' ); ?></span>
-                        </a>
-                </div>
-
-                <div id="widgets-right" class="wp-clearfix"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
-                <div class="wp-full-overlay-sidebar-content" tabindex="-1">
-                        <div id="customize-info" class="accordion-section customize-info">
-                                <div class="accordion-section-title">
-                                        <span class="preview-notice"><?php
-                                                echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
-                                        ?></span>
-                                        <button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
-                                </div>
-                                <div class="customize-panel-description"><?php
-                                        _e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
-                                ?></div>
-                        </div>
-
-                        <div id="customize-theme-controls">
-                                <ul class="customize-pane-parent"><?php // Panels and sections are managed here via JavaScript ?></ul>
-                        </div>
-                </div>
-                </div>
-
-                <div id="customize-footer-actions" class="wp-full-overlay-footer">
-                        <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php echo esc_attr( _x( 'Hide Controls', 'label for hide controls button without length constraints' ) ); ?>">
-                                <span class="collapse-sidebar-arrow"></span>
-                                <span class="collapse-sidebar-label"><?php _ex( 'Hide Controls', 'short (~12 characters) label for hide controls button' ); ?></span>
-                        </button>
-                        <?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
-                        <?php if ( ! empty( $previewable_devices ) ) : ?>
-                        <div class="devices-wrapper">
-                                <div class="devices">
-                                        <?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
-                                                <?php
-                                                if ( empty( $settings['label'] ) ) {
-                                                        continue;
-                                                }
-                                                $active = ! empty( $settings['default'] );
-                                                $class = 'preview-' . $device;
-                                                if ( $active ) {
-                                                        $class .= ' active';
-                                                }
-                                                ?>
-                                                <button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
-                                                        <span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
-                                                </button>
-                                        <?php endforeach; ?>
-                                </div>
-                        </div>
-                        <?php endif; ?>
-                </div>
-        </form>
-        <div id="customize-preview" class="wp-full-overlay-main"></div>
-        <?php
-
-        /**
-         * Prints templates, control scripts, and settings in the footer.
-         *
-         * @since 3.4.0
-         */
-        do_action( 'customize_controls_print_footer_scripts' );
-        ?>
+    <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
+        <div id="customize-header-actions" class="wp-full-overlay-header">
+            <?php
+            $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
+            $save_attrs = array();
+            if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts ) ) {
+                $save_attrs['style'] = 'display: none';
+            }
+            submit_button( $save_text, 'primary save', 'save', false, $save_attrs );
+            ?>
+            <span class="spinner"></span>
+            <button type="button" class="customize-controls-preview-toggle">
+                <span class="controls"><?php _e( 'Customize' ); ?></span>
+                <span class="preview"><?php _e( 'Preview' ); ?></span>
+            </button>
+            <a class="customize-controls-close" href="<?php echo esc_url( $wp_customize->get_return_url() ); ?>">
+                <span class="screen-reader-text"><?php _e( 'Close the Customizer and go back to the previous page' ); ?></span>
+            </a>
+        </div>
+
+        <div id="widgets-right" class="wp-clearfix"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
+        <div class="wp-full-overlay-sidebar-content" tabindex="-1">
+            <div id="customize-info" class="accordion-section customize-info">
+                <div class="accordion-section-title">
+                    <span class="preview-notice"><?php
+                        echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
+                    ?></span>
+                    <button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+                </div>
+                <div class="customize-panel-description"><?php
+                    _e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
+                ?></div>
+            </div>
+
+            <div id="customize-theme-controls">
+                <ul class="customize-pane-parent"><?php // Panels and sections are managed here via JavaScript ?></ul>
+            </div>
+        </div>
+        </div>
+
+        <div id="customize-footer-actions" class="wp-full-overlay-footer">
+            <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php echo esc_attr( _x( 'Hide Controls', 'label for hide controls button without length constraints' ) ); ?>">
+                <span class="collapse-sidebar-arrow"></span>
+                <span class="collapse-sidebar-label"><?php _ex( 'Hide Controls', 'short (~12 characters) label for hide controls button' ); ?></span>
+            </button>
+            <?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
+            <?php if ( ! empty( $previewable_devices ) ) : ?>
+            <div class="devices-wrapper">
+                <div class="devices">
+                    <?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
+                        <?php
+                        if ( empty( $settings['label'] ) ) {
+                            continue;
+                        }
+                        $active = ! empty( $settings['default'] );
+                        $class = 'preview-' . $device;
+                        if ( $active ) {
+                            $class .= ' active';
+                        }
+                        ?>
+                        <button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
+                            <span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
+                        </button>
+                    <?php endforeach; ?>
+                </div>
+            </div>
+            <?php endif; ?>
+        </div>
+    </form>
+    <div id="customize-preview" class="wp-full-overlay-main"></div>
+    <?php
+
+    /**
+     * Prints templates, control scripts, and settings in the footer.
+     *
+     * @since 3.4.0
+     */
+    do_action( 'customize_controls_print_footer_scripts' );
+    ?>
 </div>
 </body>
 </html>

src/wp-admin/edit-tag-form.php

@@ -8 +8 @@
 
 // don't load directly
 if ( ! defined( 'ABSPATH' ) ) {
-        die( '-1' );
+    die( '-1' );
 }
 
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
-        /**
-         * Fires before the Edit Category form.
-         *
-         * @since 2.1.0
-         * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
-         *
-         * @param object $tag Current category term object.
-         */
-        do_action( 'edit_category_form_pre', $tag );
+    /**
+      * Fires before the Edit Category form.
+     *
+     * @since 2.1.0
+     * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
+     *
+     * @param object $tag Current category term object.
+     */
+    do_action( 'edit_category_form_pre', $tag );
 } elseif ( 'link_category' == $taxonomy ) {
-        /**
-         * Fires before the Edit Link Category form.
-         *
-         * @since 2.3.0
-         * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
-         *
-         * @param object $tag Current link category term object.
-         */
-        do_action( 'edit_link_category_form_pre', $tag );
+    /**
+     * Fires before the Edit Link Category form.
+     *
+     * @since 2.3.0
+     * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
+     *
+     * @param object $tag Current link category term object.
+     */
+    do_action( 'edit_link_category_form_pre', $tag );
 } else {
-        /**
-         * Fires before the Edit Tag form.
-         *
-         * @since 2.5.0
-         * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
-         *
-         * @param object $tag Current tag term object.
-         */
-        do_action( 'edit_tag_form_pre', $tag );
+    /**
+     * Fires before the Edit Tag form.
+     *
+     * @since 2.5.0
+     * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
+     *
+     * @param object $tag Current tag term object.
+     */
+    do_action( 'edit_tag_form_pre', $tag );
 }
 
-/**
- * Use with caution, see https://codex.wordpress.org/Function_Reference/wp_reset_vars
- */
-wp_reset_vars( array( 'wp_http_referer' ) );
+$wp_http_referer = wp_assign_request_var('$wp_http_referer');
 
 $wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
 
@@ -72 +69 @@
 
 <?php if ( $message ) : ?>
 <div id="message" class="updated">
-        <p><strong><?php echo $message; ?></strong></p>
-        <?php if ( $wp_http_referer ) { ?>
-        <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php
-                /* translators: %s: taxonomy name */
-                printf( _x( '&larr; Back to %s', 'admin screen' ), $tax->labels->name );
-        ?></a></p>
-        <?php } ?>
+    <p><strong><?php echo $message; ?></strong></p>
+    <?php if ( $wp_http_referer ) { ?>
+    <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php
+        /* translators: %s: taxonomy name */
+        printf( _x( '&larr; Back to %s', 'admin screen' ), $tax->labels->name );
+    ?></a></p>
+    <?php } ?>
 </div>
 <?php endif; ?>
 
@@ -115 +112 @@
  */
 do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
 ?>
-        <table class="form-table">
-                <tr class="form-field form-required term-name-wrap">
-                        <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-                        <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
-                        <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
-                </tr>
+    <table class="form-table">
+        <tr class="form-field form-required term-name-wrap">
+            <th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
+            <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+            <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
+        </tr>
 <?php if ( !global_terms_enabled() ) { ?>
-                <tr class="form-field term-slug-wrap">
-                        <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
-                        <?php
-                        /**
-                         * Filters the editable slug.
-                         *
-                         * Note: This is a multi-use hook in that it is leveraged both for editable
-                         * post URIs and term slugs.
-                         *
-                         * @since 2.6.0
-                         * @since 4.4.0 The `$tag` parameter was added.
-                         *
-                         * @param string         $slug The editable slug. Will be either a term slug or post URI depending
-                         *                             upon the context in which it is evaluated.
-                         * @param object|WP_Post $tag  Term or WP_Post object.
-                         */
-                        $slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
-                        ?>
-                        <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
-                        <p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
-                </tr>
+        <tr class="form-field term-slug-wrap">
+            <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
+            <?php
+            /**
+             * Filters the editable slug.
+             *
+             * Note: This is a multi-use hook in that it is leveraged both for editable
+             * post URIs and term slugs.
+             *
+             * @since 2.6.0
+             * @since 4.4.0 The `$tag` parameter was added.
+             *
+             * @param string         $slug The editable slug. Will be either a term slug or post URI depending
+             *                             upon the context in which it is evaluated.
+             * @param object|WP_Post $tag  Term or WP_Post object.
+             */
+            $slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
+            ?>
+            <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
+            <p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
+        </tr>
 <?php } ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
-                <tr class="form-field term-parent-wrap">
-                        <th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
-                        <td>
-                                <?php
-                                $dropdown_args = array(
-                                        'hide_empty'       => 0,
-                                        'hide_if_empty'    => false,
-                                        'taxonomy'         => $taxonomy,
-                                        'name'             => 'parent',
-                                        'orderby'          => 'name',
-                                        'selected'         => $tag->parent,
-                                        'exclude_tree'     => $tag->term_id,
-                                        'hierarchical'     => true,
-                                        'show_option_none' => __( 'None' ),
-                                );
+        <tr class="form-field term-parent-wrap">
+            <th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
+            <td>
+                <?php
+                $dropdown_args = array(
+                    'hide_empty'       => 0,
+                    'hide_if_empty'    => false,
+                    'taxonomy'         => $taxonomy,
+                    'name'             => 'parent',
+                    'orderby'          => 'name',
+                    'selected'         => $tag->parent,
+                    'exclude_tree'     => $tag->term_id,
+                    'hierarchical'     => true,
+                    'show_option_none' => __( 'None' ),
+                );
 
-                                /** This filter is documented in wp-admin/edit-tags.php */
-                                $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-                                wp_dropdown_categories( $dropdown_args ); ?>
-                                <?php if ( 'category' == $taxonomy ) : ?>
-                                        <p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
-                                <?php else : ?>
-                                        <p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
-                                <?php endif; ?>
-                        </td>
-                </tr>
+                /** This filter is documented in wp-admin/edit-tags.php */
+                $dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
+                wp_dropdown_categories( $dropdown_args ); ?>
+                <?php if ( 'category' == $taxonomy ) : ?>
+                    <p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
+                <?php else : ?>
+                    <p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
+                <?php endif; ?>
+            </td>
+        </tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
-                <tr class="form-field term-description-wrap">
-                        <th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
-                        <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
-                        <p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
-                </tr>
-                <?php
-                // Back compat hooks
-                if ( 'category' == $taxonomy ) {
-                        /**
-                         * Fires after the Edit Category form fields are displayed.
-                         *
-                         * @since 2.9.0
-                         * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
-                         *
-                         * @param object $tag Current category term object.
-                         */
-                        do_action( 'edit_category_form_fields', $tag );
-                } elseif ( 'link_category' == $taxonomy ) {
-                        /**
-                         * Fires after the Edit Link Category form fields are displayed.
-                         *
-                         * @since 2.9.0
-                         * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
-                         *
-                         * @param object $tag Current link category term object.
-                         */
-                        do_action( 'edit_link_category_form_fields', $tag );
-                } else {
-                        /**
-                         * Fires after the Edit Tag form fields are displayed.
-                         *
-                         * @since 2.9.0
-                         * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
-                         *
-                         * @param object $tag Current tag term object.
-                         */
-                        do_action( 'edit_tag_form_fields', $tag );
-                }
-                /**
-                 * Fires after the Edit Term form fields are displayed.
-                 *
-                 * The dynamic portion of the hook name, `$taxonomy`, refers to
-                 * the taxonomy slug.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param object $tag      Current taxonomy term object.
-                 * @param string $taxonomy Current taxonomy slug.
-                 */
-                do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
-                ?>
-        </table>
+        <tr class="form-field term-description-wrap">
+            <th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
+            <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
+            <p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
+        </tr>
+        <?php
+        // Back compat hooks
+        if ( 'category' == $taxonomy ) {
+            /**
+             * Fires after the Edit Category form fields are displayed.
+             *
+             * @since 2.9.0
+             * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
+             *
+             * @param object $tag Current category term object.
+             */
+            do_action( 'edit_category_form_fields', $tag );
+        } elseif ( 'link_category' == $taxonomy ) {
+            /**
+             * Fires after the Edit Link Category form fields are displayed.
+             *
+             * @since 2.9.0
+             * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
+             *
+             * @param object $tag Current link category term object.
+             */
+            do_action( 'edit_link_category_form_fields', $tag );
+        } else {
+            /**
+             * Fires after the Edit Tag form fields are displayed.
+             *
+             * @since 2.9.0
+             * @deprecated 3.0.0 Use {$taxonomy}_edit_form_fields instead.
+             *
+             * @param object $tag Current tag term object.
+             */
+            do_action( 'edit_tag_form_fields', $tag );
+        }
+        /**
+         * Fires after the Edit Term form fields are displayed.
+         *
+         * The dynamic portion of the hook name, `$taxonomy`, refers to
+         * the taxonomy slug.
+         *
+         * @since 3.0.0
+         *
+         * @param object $tag      Current taxonomy term object.
+         * @param string $taxonomy Current taxonomy slug.
+         */
+        do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
+        ?>
+    </table>
 <?php
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
-        /** This action is documented in wp-admin/edit-tags.php */
-        do_action( 'edit_category_form', $tag );
+    /** This action is documented in wp-admin/edit-tags.php */
+    do_action( 'edit_category_form', $tag );
 } elseif ( 'link_category' == $taxonomy ) {
-        /** This action is documented in wp-admin/edit-tags.php */
-        do_action( 'edit_link_category_form', $tag );
+    /** This action is documented in wp-admin/edit-tags.php */
+    do_action( 'edit_link_category_form', $tag );
 } else {
-        /**
-         * Fires at the end of the Edit Term form.
-         *
-         * @since 2.5.0
-         * @deprecated 3.0.0 Use {$taxonomy}_edit_form instead.
-         *
-         * @param object $tag Current taxonomy term object.
-         */
-        do_action( 'edit_tag_form', $tag );
+    /**
+     * Fires at the end of the Edit Term form.
+     *
+     * @since 2.5.0
+     * @deprecated 3.0.0 Use {$taxonomy}_edit_form instead.
+     *
+     * @param object $tag Current taxonomy term object.
+     */
+    do_action( 'edit_tag_form', $tag );
 }
 /**
  * Fires at the end of the Edit Term form for all taxonomies.
@@ -258 +255 @@
 
 <div class="edit-tag-actions">
 
-        <?php submit_button( __( 'Update' ), 'primary', null, false ); ?>
+    <?php submit_button( __( 'Update' ), 'primary', null, false ); ?>
 
-        <?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
-                <span id="delete-link">
-                        <a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"><?php _e( 'Delete' ); ?></a>
-                </span>
-        <?php endif; ?>
+    <?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
+        <span id="delete-link">
+            <a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"><?php _e( 'Delete' ); ?></a>
+        </span>
+    <?php endif; ?>
 
 </div>
 

src/wp-admin/includes/class-wp-links-list-table.php

@@ -17 +17 @@
  */
 class WP_Links_List_Table extends WP_List_Table {
 
-        /**
-         * Constructor.
-         *
-         * @since 3.1.0
-         * @access public
-         *
-         * @see WP_List_Table::__construct() for more information on default arguments.
-         *
-         * @param array $args An associative array of arguments.
-         */
-        public function __construct( $args = array() ) {
-                parent::__construct( array(
-                        'plural' => 'bookmarks',
-                        'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-                ) );
-        }
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        parent::__construct( array(
+            'plural' => 'bookmarks',
+            'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+        ) );
+    }
 
-        /**
-         *
-         * @return bool
-         */
-        public function ajax_user_can() {
-                return current_user_can( 'manage_links' );
-        }
+    /**
+     *
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can( 'manage_links' );
+    }
 
-        /**
-         *
-         * @global int    $cat_id
-         * @global string $s
-         * @global string $orderby
-         * @global string $order
-         */
-        public function prepare_items() {
-                global $cat_id, $s, $orderby, $order;
 
-                wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
+    public function prepare_items() {
+        $cat_id = wp_assign_request_var('cat_id');
+        $s = wp_assign_request_var('s');
+        $orderby = wp_assign_request_var('orderby');
+        $order = wp_assign_request_var('order');
 
-                $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-                if ( 'all' != $cat_id )
-                        $args['category'] = $cat_id;
-                if ( !empty( $s ) )
-                        $args['search'] = $s;
-                if ( !empty( $orderby ) )
-                        $args['orderby'] = $orderby;
-                if ( !empty( $order ) )
-                        $args['order'] = $order;
+        $args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
 
-                $this->items = get_bookmarks( $args );
-        }
+        if ( 'all' != $cat_id ) {
+            $args['category'] = $cat_id;
+        }
+        if ( !empty( $s ) ) {
+            $args['search'] = $s;
+        }
+        if ( !empty( $orderby ) ) {
+            $args['orderby'] = $orderby;
+        }
+        if ( !empty( $order ) ) {
+            $args['order'] = $order;
+        }
 
-        /**
-         * @access public
-         */
-        public function no_items() {
-                _e( 'No links found.' );
-        }
+        $this->items = get_bookmarks( $args );
+    }
 
-        /**
-         *
-         * @return array
-         */
-        protected function get_bulk_actions() {
-                $actions = array();
-                $actions['delete'] = __( 'Delete' );
+    /**
+     * @access public
+     */
+    public function no_items() {
+        _e( 'No links found.' );
+    }
 
-                return $actions;
-        }
+    /**
+     *
+     * @return array
+     */
+    protected function get_bulk_actions() {
+        $actions = array();
+        $actions['delete'] = __( 'Delete' );
 
-        /**
-         *
-         * @global int $cat_id
-         * @param string $which
-         */
-        protected function extra_tablenav( $which ) {
-                global $cat_id;
+        return $actions;
+    }
 
-                if ( 'top' != $which )
-                        return;
+    /**
+     *
+     * @global int $cat_id
+     * @param string $which
+     */
+    protected function extra_tablenav( $which ) {
+        global $cat_id;
+
+        if ( 'top' != $which )
+            return;
 ?>
-                <div class="alignleft actions">
+        <div class="alignleft actions">
 <?php
-                        $dropdown_options = array(
-                                'selected' => $cat_id,
-                                'name' => 'cat_id',
-                                'taxonomy' => 'link_category',
-                                'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
-                                'hide_empty' => true,
-                                'hierarchical' => 1,
-                                'show_count' => 0,
-                                'orderby' => 'name',
-                        );
+            $dropdown_options = array(
+                'selected' => $cat_id,
+                'name' => 'cat_id',
+                'taxonomy' => 'link_category',
+                'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
+                'hide_empty' => true,
+                'hierarchical' => 1,
+                'show_count' => 0,
+                'orderby' => 'name',
+            );
 
-                        echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
-                        wp_dropdown_categories( $dropdown_options );
-                        submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+            echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
+            wp_dropdown_categories( $dropdown_options );
+            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
 ?>
-                </div>
+        </div>
 <?php
-        }
+    }
 
-        /**
-         *
-         * @return array
-         */
-        public function get_columns() {
-                return array(
-                        'cb'         => '<input type="checkbox" />',
-                        'name'       => _x( 'Name', 'link name' ),
-                        'url'        => __( 'URL' ),
-                        'categories' => __( 'Categories' ),
-                        'rel'        => __( 'Relationship' ),
-                        'visible'    => __( 'Visible' ),
-                        'rating'     => __( 'Rating' )
-                );
-        }
+    /**
+     *
+     * @return array
+     */
+    public function get_columns() {
+        return array(
+            'cb'         => '<input type="checkbox" />',
+            'name'       => _x( 'Name', 'link name' ),
+            'url'        => __( 'URL' ),
+            'categories' => __( 'Categories' ),
+            'rel'        => __( 'Relationship' ),
+            'visible'    => __( 'Visible' ),
+            'rating'     => __( 'Rating' )
+        );
+    }
 
-        /**
-         *
-         * @return array
-         */
-        protected function get_sortable_columns() {
-                return array(
-                        'name'    => 'name',
-                        'url'     => 'url',
-                        'visible' => 'visible',
-                        'rating'  => 'rating'
-                );
-        }
+    /**
+     *
+     * @return array
+     */
+    protected function get_sortable_columns() {
+        return array(
+            'name'    => 'name',
+            'url'     => 'url',
+            'visible' => 'visible',
+            'rating'  => 'rating'
+        );
+    }
 
-        /**
-         * Get the name of the default primary column.
-         *
-         * @since 4.3.0
-         * @access protected
-         *
-         * @return string Name of the default primary column, in this case, 'name'.
-         */
-        protected function get_default_primary_column_name() {
-                return 'name';
-        }
+    /**
+     * Get the name of the default primary column.
+     *
+     * @since 4.3.0
+     * @access protected
+     *
+     * @return string Name of the default primary column, in this case, 'name'.
+     */
+    protected function get_default_primary_column_name() {
+        return 'name';
+    }
 
-        /**
-         * Handles the checkbox column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_cb( $link ) {
-                ?>
-                <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
-                <input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
-                <?php
-        }
+    /**
+     * Handles the checkbox column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_cb( $link ) {
+        ?>
+        <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>"><?php echo sprintf( __( 'Select %s' ), $link->link_name ); ?></label>
+        <input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
+        <?php
+    }
 
-        /**
-         * Handles the link name column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_name( $link ) {
-                $edit_link = get_edit_bookmark_link( $link );
-                printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
-                        $edit_link,
-                        /* translators: %s: link name */
-                        esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
-                        $link->link_name
-                );
-        }
+    /**
+     * Handles the link name column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_name( $link ) {
+        $edit_link = get_edit_bookmark_link( $link );
+        printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+            $edit_link,
+            /* translators: %s: link name */
+            esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
+            $link->link_name
+        );
+    }
 
-        /**
-         * Handles the link URL column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_url( $link ) {
-                $short_url = url_shorten( $link->link_url );
-                echo "<a href='$link->link_url'>$short_url</a>";
-        }
+    /**
+     * Handles the link URL column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_url( $link ) {
+        $short_url = url_shorten( $link->link_url );
+        echo "<a href='$link->link_url'>$short_url</a>";
+    }
 
-        /**
-         * Handles the link categories column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @global $cat_id
-         *
-         * @param object $link The current link object.
-         */
-        public function column_categories( $link ) {
-                global $cat_id;
+    /**
+     * Handles the link categories column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @global $cat_id
+     *
+     * @param object $link The current link object.
+     */
+    public function column_categories( $link ) {
+        global $cat_id;
 
-                $cat_names = array();
-                foreach ( $link->link_category as $category ) {
-                        $cat = get_term( $category, 'link_category', OBJECT, 'display' );
-                        if ( is_wp_error( $cat ) ) {
-                                echo $cat->get_error_message();
-                        }
-                        $cat_name = $cat->name;
-                        if ( $cat_id != $category ) {
-                                $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
-                        }
-                        $cat_names[] = $cat_name;
-                }
-                echo implode( ', ', $cat_names );
-        }
+        $cat_names = array();
+        foreach ( $link->link_category as $category ) {
+            $cat = get_term( $category, 'link_category', OBJECT, 'display' );
+            if ( is_wp_error( $cat ) ) {
+                echo $cat->get_error_message();
+            }
+            $cat_name = $cat->name;
+            if ( $cat_id != $category ) {
+                $cat_name = "<a href='link-manager.php?cat_id=$category'>$cat_name</a>";
+            }
+            $cat_names[] = $cat_name;
+        }
+        echo implode( ', ', $cat_names );
+    }
 
-        /**
-         * Handles the link relation column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_rel( $link ) {
-                echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
-        }
+    /**
+     * Handles the link relation column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_rel( $link ) {
+        echo empty( $link->link_rel ) ? '<br />' : $link->link_rel;
+    }
 
-        /**
-         * Handles the link visibility column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_visible( $link ) {
-                if ( 'Y' === $link->link_visible ) {
-                        _e( 'Yes' );
-                } else {
-                        _e( 'No' );
-                }
-        }
+    /**
+     * Handles the link visibility column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_visible( $link ) {
+        if ( 'Y' === $link->link_visible ) {
+            _e( 'Yes' );
+        } else {
+            _e( 'No' );
+        }
+    }
 
-        /**
-         * Handles the link rating column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link The current link object.
-         */
-        public function column_rating( $link ) {
-                echo $link->link_rating;
-        }
+    /**
+     * Handles the link rating column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link The current link object.
+     */
+    public function column_rating( $link ) {
+        echo $link->link_rating;
+    }
 
-        /**
-         * Handles the default column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param object $link        Link object.
-         * @param string $column_name Current column name.
-         */
-        public function column_default( $link, $column_name ) {
-                /**
-                 * Fires for each registered custom link column.
-                 *
-                 * @since 2.1.0
-                 *
-                 * @param string $column_name Name of the custom column.
-                 * @param int    $link_id     Link ID.
-                 */
-                do_action( 'manage_link_custom_column', $column_name, $link->link_id );
-        }
+    /**
+     * Handles the default column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param object $link        Link object.
+     * @param string $column_name Current column name.
+     */
+    public function column_default( $link, $column_name ) {
+        /**
+         * Fires for each registered custom link column.
+         *
+         * @since 2.1.0
+         *
+         * @param string $column_name Name of the custom column.
+         * @param int    $link_id     Link ID.
+         */
+        do_action( 'manage_link_custom_column', $column_name, $link->link_id );
+    }
 
-        public function display_rows() {
-                foreach ( $this->items as $link ) {
-                        $link = sanitize_bookmark( $link );
-                        $link->link_name = esc_attr( $link->link_name );
-                        $link->link_category = wp_get_link_cats( $link->link_id );
+    public function display_rows() {
+        foreach ( $this->items as $link ) {
+            $link = sanitize_bookmark( $link );
+            $link->link_name = esc_attr( $link->link_name );
+            $link->link_category = wp_get_link_cats( $link->link_id );
 ?>
-                <tr id="link-<?php echo $link->link_id; ?>">
-                        <?php $this->single_row_columns( $link ) ?>
-                </tr>
+        <tr id="link-<?php echo $link->link_id; ?>">
+            <?php $this->single_row_columns( $link ) ?>
+        </tr>
 <?php
-                }
-        }
+        }
+    }
 
-        /**
-         * Generates and displays row action links.
-         *
-         * @since 4.3.0
-         * @access protected
-         *
-         * @param object $link        Link being acted upon.
-         * @param string $column_name Current column name.
-         * @param string $primary     Primary column name.
-         * @return string Row action output for links.
-         */
-        protected function handle_row_actions( $link, $column_name, $primary ) {
-                if ( $primary !== $column_name ) {
-                        return '';
-                }
+    /**
+     * Generates and displays row action links.
+     *
+     * @since 4.3.0
+     * @access protected
+     *
+     * @param object $link        Link being acted upon.
+     * @param string $column_name Current column name.
+     * @param string $primary     Primary column name.
+     * @return string Row action output for links.
+     */
+    protected function handle_row_actions( $link, $column_name, $primary ) {
+        if ( $primary !== $column_name ) {
+            return '';
+        }
 
-                $edit_link = get_edit_bookmark_link( $link );
+        $edit_link = get_edit_bookmark_link( $link );
 
-                $actions = array();
-                $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-                $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
-                return $this->row_actions( $actions );
-        }
+        $actions = array();
+        $actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+        $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)) . "' ) ) { return true;}return false;\">" . __('Delete') . "</a>";
+        return $this->row_actions( $actions );
+    }
 }

src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -17 +17 @@
  */
 class WP_MS_Themes_List_Table extends WP_List_Table {
 
-        public $site_id;
-        public $is_site_themes;
-
-        private $has_items;
-
-        /**
-         * Constructor.
-         *
-         * @since 3.1.0
-         * @access public
-         *
-         * @see WP_List_Table::__construct() for more information on default arguments.
-         *
-         * @global string $status
-         * @global int    $page
-         *
-         * @param array $args An associative array of arguments.
-         */
-        public function __construct( $args = array() ) {
-                global $status, $page;
-
-                parent::__construct( array(
-                        'plural' => 'themes',
-                        'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-                ) );
-
-                $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-                if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
-                        $status = 'all';
-
-                $page = $this->get_pagenum();
-
-                $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
-
-                if ( $this->is_site_themes )
-                        $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
-        }
-
-        /**
-         *
-         * @return array
-         */
-        protected function get_table_classes() {
-                // todo: remove and add CSS for .themes
-                return array( 'widefat', 'plugins' );
-        }
-
-        /**
-         *
-         * @return bool
-         */
-        public function ajax_user_can() {
-                if ( $this->is_site_themes )
-                        return current_user_can( 'manage_sites' );
-                else
-                        return current_user_can( 'manage_network_themes' );
-        }
-
-        /**
-         *
-         * @global string $status
-         * @global array $totals
-         * @global int $page
-         * @global string $orderby
-         * @global string $order
-         * @global string $s
-         */
-        public function prepare_items() {
-                global $status, $totals, $page, $orderby, $order, $s;
-
-                wp_reset_vars( array( 'orderby', 'order', 's' ) );
-
-                $themes = array(
-                        /**
-                         * Filters the full array of WP_Theme objects to list in the Multisite
-                         * themes list table.
-                         *
-                         * @since 3.1.0
-                         *
-                         * @param array $all An array of WP_Theme objects to display in the list table.
-                         */
-                        'all' => apply_filters( 'all_themes', wp_get_themes() ),
-                        'search' => array(),
-                        'enabled' => array(),
-                        'disabled' => array(),
-                        'upgrade' => array(),
-                        'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
-                );
-
-                if ( $this->is_site_themes ) {
-                        $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
-                        $allowed_where = 'site';
-                } else {
-                        $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
-                        $allowed_where = 'network';
-                }
-
-                $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
-
-                foreach ( (array) $themes['all'] as $key => $theme ) {
-                        if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
-                                unset( $themes['all'][ $key ] );
-                                continue;
-                        }
-
-                        if ( $maybe_update && isset( $current->response[ $key ] ) ) {
-                                $themes['all'][ $key ]->update = true;
-                                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
-                        }
-
-                        $filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
-                        $themes[ $filter ][ $key ] = $themes['all'][ $key ];
-                }
-
-                if ( $s ) {
-                        $status = 'search';
-                        $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
-                }
-
-                $totals = array();
-                foreach ( $themes as $type => $list )
-                        $totals[ $type ] = count( $list );
-
-                if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-                        $status = 'all';
-
-                $this->items = $themes[ $status ];
-                WP_Theme::sort_by_name( $this->items );
-
-                $this->has_items = ! empty( $themes['all'] );
-                $total_this_page = $totals[ $status ];
-
-                wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-                        'themes' => $totals,
-                        'totals' => wp_get_update_data(),
-                ) );
-
-                if ( $orderby ) {
-                        $orderby = ucfirst( $orderby );
-                        $order = strtoupper( $order );
-
-                        if ( $orderby === 'Name' ) {
-                                if ( 'ASC' === $order ) {
-                                        $this->items = array_reverse( $this->items );
-                                }
-                        } else {
-                                uasort( $this->items, array( $this, '_order_callback' ) );
-                        }
-                }
-
-                $start = ( $page - 1 ) * $themes_per_page;
-
-                if ( $total_this_page > $themes_per_page )
-                        $this->items = array_slice( $this->items, $start, $themes_per_page, true );
-
-                $this->set_pagination_args( array(
-                        'total_items' => $total_this_page,
-                        'per_page' => $themes_per_page,
-                ) );
-        }
-
-        /**
-         * @staticvar string $term
-         * @param WP_Theme $theme
-         * @return bool
-         */
-        public function _search_callback( $theme ) {
-                static $term = null;
-                if ( is_null( $term ) )
-                        $term = wp_unslash( $_REQUEST['s'] );
-
-                foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
-                        // Don't mark up; Do translate.
-                        if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
-                                return true;
-                }
-
-                if ( false !== stripos( $theme->get_stylesheet(), $term ) )
-                        return true;
-
-                if ( false !== stripos( $theme->get_template(), $term ) )
-                        return true;
-
-                return false;
-        }
-
-        // Not used by any core columns.
-        /**
-         * @global string $orderby
-         * @global string $order
-         * @param array $theme_a
-         * @param array $theme_b
-         * @return int
-         */
-        public function _order_callback( $theme_a, $theme_b ) {
-                global $orderby, $order;
-
-                $a = $theme_a[ $orderby ];
-                $b = $theme_b[ $orderby ];
-
-                if ( $a == $b )
-                        return 0;
-
-                if ( 'DESC' === $order )
-                        return ( $a < $b ) ? 1 : -1;
-                else
-                        return ( $a < $b ) ? -1 : 1;
-        }
-
-        /**
-         * @access public
-         */
-        public function no_items() {
-                if ( $this->has_items ) {
-                        _e( 'No themes found.' );
-                } else {
-                        _e( 'You do not appear to have any themes available at this time.' );
-                }
-        }
-
-        /**
-         *
-         * @return array
-         */
-        public function get_columns() {
-                return array(
-                        'cb'          => '<input type="checkbox" />',
-                        'name'        => __( 'Theme' ),
-                        'description' => __( 'Description' ),
-                );
-        }
-
-        /**
-         *
-         * @return array
-         */
-        protected function get_sortable_columns() {
-                return array(
-                        'name'         => 'name',
-                );
-        }
-
-        /**
-         * Gets the name of the primary column.
-         *
-         * @since 4.3.0
-         * @access protected
-         *
-         * @return string Unalterable name of the primary column name, in this case, 'name'.
-         */
-        protected function get_primary_column_name() {
-                return 'name';
-        }
-
-        /**
-         *
-         * @global array $totals
-         * @global string $status
-         * @return array
-         */
-        protected function get_views() {
-                global $totals, $status;
-
-                $status_links = array();
-                foreach ( $totals as $type => $count ) {
-                        if ( !$count )
-                                continue;
-
-                        switch ( $type ) {
-                                case 'all':
-                                        $text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes' );
-                                        break;
-                                case 'enabled':
-                                        $text = _n( 'Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'disabled':
-                                        $text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'upgrade':
-                                        $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'broken' :
-                                        $text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
-                                        break;
-                        }
-
-                        if ( $this->is_site_themes )
-                                $url = 'site-themes.php?id=' . $this->site_id;
-                        else
-                                $url = 'themes.php';
-
-                        if ( 'search' != $type ) {
-                                $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-                                        esc_url( add_query_arg('theme_status', $type, $url) ),
-                                        ( $type === $status ) ? ' class="current"' : '',
-                                        sprintf( $text, number_format_i18n( $count ) )
-                                );
-                        }
-                }
-
-                return $status_links;
-        }
-
-        /**
-         * @global string $status
-         *
-         * @return array
-         */
-        protected function get_bulk_actions() {
-                global $status;
-
-                $actions = array();
-                if ( 'enabled' != $status )
-                        $actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-                if ( 'disabled' != $status )
-                        $actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
-                if ( ! $this->is_site_themes ) {
-                        if ( current_user_can( 'update_themes' ) )
-                                $actions['update-selected'] = __( 'Update' );
-                        if ( current_user_can( 'delete_themes' ) )
-                                $actions['delete-selected'] = __( 'Delete' );
-                }
-                return $actions;
-        }
-
-        /**
-         * @access public
-         */
-        public function display_rows() {
-                foreach ( $this->items as $theme )
-                        $this->single_row( $theme );
-        }
-
-        /**
-         * Handles the checkbox column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param WP_Theme $theme The current WP_Theme object.
-         */
-        public function column_cb( $theme ) {
-                $checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
-                ?>
-                <input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
-                <label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
-                <?php
-        }
-
-        /**
-         * Handles the name column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @global string $status
-         * @global int    $page
-         * @global string $s
-         *
-         * @param WP_Theme $theme The current WP_Theme object.
-         */
-        public function column_name( $theme ) {
-                global $status, $page, $s;
-
-                $context = $status;
-
-                if ( $this->is_site_themes ) {
-                        $url = "site-themes.php?id={$this->site_id}&amp;";
-                        $allowed = $theme->is_allowed( 'site', $this->site_id );
-                } else {
-                        $url = 'themes.php?';
-                        $allowed = $theme->is_allowed( 'network' );
-                }
-
-                // Pre-order.
-                $actions = array(
-                        'enable' => '',
-                        'disable' => '',
-                        'edit' => '',
-                        'delete' => ''
-                );
-
-                $stylesheet = $theme->get_stylesheet();
-                $theme_key = urlencode( $stylesheet );
-
-                if ( ! $allowed ) {
-                        if ( ! $theme->errors() ) {
-                                $url = add_query_arg( array(
-                                        'action' => 'enable',
-                                        'theme'  => $theme_key,
-                                        'paged'  => $page,
-                                        's'      => $s,
-                                ), $url );
-
-                                if ( $this->is_site_themes ) {
-                                        /* translators: %s: theme name */
-                                        $aria_label = sprintf( __( 'Enable %s' ), $theme->display( 'Name' ) );
-                                } else {
-                                        /* translators: %s: theme name */
-                                        $aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
-                                }
-
-                                $actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
-                                        esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
-                                        esc_attr( $aria_label ),
-                                        ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
-                                );
-                        }
-                } else {
-                        $url = add_query_arg( array(
-                                'action' => 'disable',
-                                'theme'  => $theme_key,
-                                'paged'  => $page,
-                                's'      => $s,
-                        ), $url );
-
-                        if ( $this->is_site_themes ) {
-                                /* translators: %s: theme name */
-                                $aria_label = sprintf( __( 'Disable %s' ), $theme->display( 'Name' ) );
-                        } else {
-                                /* translators: %s: theme name */
-                                $aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
-                        }
-
-                        $actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
-                                esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
-                                esc_attr( $aria_label ),
-                                ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
-                        );
-                }
-
-                if ( current_user_can('edit_themes') ) {
-                        $url = add_query_arg( array(
-                                'theme' => $theme_key,
-                        ), 'theme-editor.php' );
-
-                        /* translators: %s: theme name */
-                        $aria_label = sprintf( __( 'Open %s in the Theme Editor' ), $theme->display( 'Name' ) );
-
-                        $actions['edit'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
-                                esc_url( $url ),
-                                esc_attr( $aria_label ),
-                                __( 'Edit' )
-                        );
-                }
-
-                if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
-                        $url = add_query_arg( array(
-                                'action'       => 'delete-selected',
-                                'checked[]'    => $theme_key,
-                                'theme_status' => $context,
-                                'paged'        => $page,
-                                's'            => $s,
-                        ), 'themes.php' );
-
-                        /* translators: %s: theme name */
-                        $aria_label = sprintf( _x( 'Delete %s', 'theme' ), $theme->display( 'Name' ) );
-
-                        $actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
-                                esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
-                                esc_attr( $aria_label ),
-                                __( 'Delete' )
-                        );
-                }
-                /**
-                 * Filters the action links displayed for each theme in the Multisite
-                 * themes list table.
-                 *
-                 * The action links displayed are determined by the theme's status, and
-                 * which Multisite themes list table is being displayed - the Network
-                 * themes list table (themes.php), which displays all installed themes,
-                 * or the Site themes list table (site-themes.php), which displays the
-                 * non-network enabled themes when editing a site in the Network admin.
-                 *
-                 * The default action links for the Network themes list table include
-                 * 'Network Enable', 'Network Disable', 'Edit', and 'Delete'.
-                 *
-                 * The default action links for the Site themes list table include
-                 * 'Enable', 'Disable', and 'Edit'.
-                 *
-                 * @since 2.8.0
-                 *
-                 * @param array    $actions An array of action links.
-                 * @param WP_Theme $theme   The current WP_Theme object.
-                 * @param string   $context Status of the theme.
-                 */
-                $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
-
-                /**
-                 * Filters the action links of a specific theme in the Multisite themes
-                 * list table.
-                 *
-                 * The dynamic portion of the hook name, `$stylesheet`, refers to the
-                 * directory name of the theme, which in most cases is synonymous
-                 * with the template name.
-                 *
-                 * @since 3.1.0
-                 *
-                 * @param array    $actions An array of action links.
-                 * @param WP_Theme $theme   The current WP_Theme object.
-                 * @param string   $context Status of the theme.
-                 */
-                $actions = apply_filters( "theme_action_links_{$stylesheet}", $actions, $theme, $context );
-
-                echo $this->row_actions( $actions, true );
-        }
-
-        /**
-         * Handles the description column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @global string $status
-         * @global array  $totals
-         *
-         * @param WP_Theme $theme The current WP_Theme object.
-         */
-        public function column_description( $theme ) {
-                global $status, $totals;
-                if ( $theme->errors() ) {
-                        $pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
-                        echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
-                }
-
-                if ( $this->is_site_themes ) {
-                        $allowed = $theme->is_allowed( 'site', $this->site_id );
-                } else {
-                        $allowed = $theme->is_allowed( 'network' );
-                }
-
-                $class = ! $allowed ? 'inactive' : 'active';
-                if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
-                        $class .= ' update';
-
-                echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
-                        <div class='$class second theme-version-author-uri'>";
-
-                $stylesheet = $theme->get_stylesheet();
-                $theme_meta = array();
-
-                if ( $theme->get('Version') ) {
-                        $theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
-                }
-                $theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
-
-                if ( $theme->get('ThemeURI') ) {
-                        /* translators: %s: theme name */
-                        $aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
-
-                        $theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
-                                $theme->display( 'ThemeURI' ),
-                                esc_attr( $aria_label ),
-                                __( 'Visit Theme Site' )
-                        );
-                }
-                /**
-                 * Filters the array of row meta for each theme in the Multisite themes
-                 * list table.
-                 *
-                 * @since 3.1.0
-                 *
-                 * @param array    $theme_meta An array of the theme's metadata,
-                 *                             including the version, author, and
-                 *                             theme URI.
-                 * @param string   $stylesheet Directory name of the theme.
-                 * @param WP_Theme $theme      WP_Theme object.
-                 * @param string   $status     Status of the theme.
-                 */
-                $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
-                echo implode( ' | ', $theme_meta );
-
-                echo '</div>';
-        }
-
-        /**
-         * Handles default column output.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param WP_Theme $theme       The current WP_Theme object.
-         * @param string   $column_name The current column name.
-         */
-        public function column_default( $theme, $column_name ) {
-                $stylesheet = $theme->get_stylesheet();
-
-                /**
-                 * Fires inside each custom column of the Multisite themes list table.
-                 *
-                 * @since 3.1.0
-                 *
-                 * @param string   $column_name Name of the column.
-                 * @param string   $stylesheet  Directory name of the theme.
-                 * @param WP_Theme $theme       Current WP_Theme object.
-                 */
-                do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
-        }
-
-        /**
-         * Handles the output for a single table row.
-         *
-         * @since 4.3.0
-         * @access public
-         *
-         * @param WP_Theme $item The current WP_Theme object.
-         */
-        public function single_row_columns( $item ) {
-                list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
-
-                foreach ( $columns as $column_name => $column_display_name ) {
-                        $extra_classes = '';
-                        if ( in_array( $column_name, $hidden ) ) {
-                                $extra_classes .= ' hidden';
-                        }
-
-                        switch ( $column_name ) {
-                                case 'cb':
-                                        echo '<th scope="row" class="check-column">';
-
-                                        $this->column_cb( $item );
-
-                                        echo '</th>';
-                                        break;
-
-                                case 'name':
-                                        echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
-
-                                        $this->column_name( $item );
-
-                                        echo "</td>";
-                                        break;
-
-                                case 'description':
-                                        echo "<td class='column-description desc{$extra_classes}'>";
-
-                                        $this->column_description( $item );
-
-                                        echo '</td>';
-                                        break;
-
-                                default:
-                                        echo "<td class='$column_name column-$column_name{$extra_classes}'>";
-
-                                        $this->column_default( $item, $column_name );
-
-                                        echo "</td>";
-                                        break;
-                        }
-                }
-        }
-
-        /**
-         * @global string $status
-         * @global array  $totals
-         *
-         * @param WP_Theme $theme
-         */
-        public function single_row( $theme ) {
-                global $status, $totals;
-
-                if ( $this->is_site_themes ) {
-                        $allowed = $theme->is_allowed( 'site', $this->site_id );
-                } else {
-                        $allowed = $theme->is_allowed( 'network' );
-                }
-
-                $stylesheet = $theme->get_stylesheet();
-
-                $class = ! $allowed ? 'inactive' : 'active';
-                if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
-                        $class .= ' update';
-                }
-
-                printf( '<tr class="%s" data-slug="%s">',
-                        esc_attr( $class ),
-                        esc_attr( $stylesheet )
-                );
-
-                $this->single_row_columns( $theme );
-
-                echo "</tr>";
-
-                if ( $this->is_site_themes )
-                        remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
-
-                /**
-                 * Fires after each row in the Multisite themes list table.
-                 *
-                 * @since 3.1.0
-                 *
-                 * @param string   $stylesheet Directory name of the theme.
-                 * @param WP_Theme $theme      Current WP_Theme object.
-                 * @param string   $status     Status of the theme.
-                 */
-                do_action( 'after_theme_row', $stylesheet, $theme, $status );
-
-                /**
-                 * Fires after each specific row in the Multisite themes list table.
-                 *
-                 * The dynamic portion of the hook name, `$stylesheet`, refers to the
-                 * directory name of the theme, most often synonymous with the template
-                 * name of the theme.
-                 *
-                 * @since 3.5.0
-                 *
-                 * @param string   $stylesheet Directory name of the theme.
-                 * @param WP_Theme $theme      Current WP_Theme object.
-                 * @param string   $status     Status of the theme.
-                 */
-                do_action( "after_theme_row_{$stylesheet}", $stylesheet, $theme, $status );
-        }
+    public $site_id;
+    public $is_site_themes;
+
+    private $has_items;
+
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @global string $status
+     * @global int    $page
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        global $status, $page;
+
+        parent::__construct( array(
+            'plural' => 'themes',
+            'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+        ) );
+
+        $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
+        if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
+            $status = 'all';
+
+        $page = $this->get_pagenum();
+
+        $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
+
+        if ( $this->is_site_themes )
+            $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+    }
+
+    /**
+     *
+     * @return array
+     */
+    protected function get_table_classes() {
+        // todo: remove and add CSS for .themes
+        return array( 'widefat', 'plugins' );
+    }
+
+    /**
+     *
+     * @return bool
+     */
+    public function ajax_user_can() {
+        if ( $this->is_site_themes )
+            return current_user_can( 'manage_sites' );
+        else
+            return current_user_can( 'manage_network_themes' );
+    }
+
+    public function prepare_items() {
+        $status = wp_assign_request_var('status');
+        $total = wp_assign_request_var('total');
+        $page = wp_assign_request_var('page');
+        $orderby = wp_assign_request_var('orderby');
+        $order = wp_assign_request_var('order');
+        $s = wp_assign_request_var('s');
+
+        $themes = array(
+            /**
+             * Filters the full array of WP_Theme objects to list in the Multisite
+             * themes list table.
+             *
+             * @since 3.1.0
+             *
+             * @param array $all An array of WP_Theme objects to display in the list table.
+             */
+            'all' => apply_filters( 'all_themes', wp_get_themes() ),
+            'search' => array(),
+            'enabled' => array(),
+            'disabled' => array(),
+            'upgrade' => array(),
+            'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
+        );
+
+        if ( $this->is_site_themes ) {
+            $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
+            $allowed_where = 'site';
+        } else {
+            $themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
+            $allowed_where = 'network';
+        }
+
+        $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
+
+        foreach ( (array) $themes['all'] as $key => $theme ) {
+            if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
+                unset( $themes['all'][ $key ] );
+                continue;
+            }
+
+            if ( $maybe_update && isset( $current->response[ $key ] ) ) {
+                $themes['all'][ $key ]->update = true;
+                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
+            }
+
+            $filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
+            $themes[ $filter ][ $key ] = $themes['all'][ $key ];
+        }
+
+        if ( $s ) {
+            $status = 'search';
+            $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
+        }
+
+        $totals = array();
+        foreach ( $themes as $type => $list )
+            $totals[ $type ] = count( $list );
+
+        if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+            $status = 'all';
+
+        $this->items = $themes[ $status ];
+        WP_Theme::sort_by_name( $this->items );
+
+        $this->has_items = ! empty( $themes['all'] );
+        $total_this_page = $totals[ $status ];
+
+        wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+            'themes' => $totals,
+            'totals' => wp_get_update_data(),
+        ) );
+
+        if ( $orderby ) {
+            $orderby = ucfirst( $orderby );
+            $order = strtoupper( $order );
+
+            if ( $orderby === 'Name' ) {
+                if ( 'ASC' === $order ) {
+                    $this->items = array_reverse( $this->items );
+                }
+            } else {
+                uasort( $this->items, array( $this, '_order_callback' ) );
+            }
+        }
+
+        $start = ( $page - 1 ) * $themes_per_page;
+
+        if ( $total_this_page > $themes_per_page )
+            $this->items = array_slice( $this->items, $start, $themes_per_page, true );
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_this_page,
+            'per_page' => $themes_per_page,
+        ) );
+    }
+
+    /**
+     * @staticvar string $term
+     * @param WP_Theme $theme
+     * @return bool
+     */
+    public function _search_callback( $theme ) {
+        static $term = null;
+        if ( is_null( $term ) )
+            $term = wp_unslash( $_REQUEST['s'] );
+
+        foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
+            // Don't mark up; Do translate.
+            if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
+                return true;
+        }
+
+        if ( false !== stripos( $theme->get_stylesheet(), $term ) )
+            return true;
+
+        if ( false !== stripos( $theme->get_template(), $term ) )
+            return true;
+
+        return false;
+    }
+
+    // Not used by any core columns.
+    /**
+     * @global string $orderby
+     * @global string $order
+     * @param array $theme_a
+     * @param array $theme_b
+     * @return int
+     */
+    public function _order_callback( $theme_a, $theme_b ) {
+        global $orderby, $order;
+
+        $a = $theme_a[ $orderby ];
+        $b = $theme_b[ $orderby ];
+
+        if ( $a == $b )
+            return 0;
+
+        if ( 'DESC' === $order )
+            return ( $a < $b ) ? 1 : -1;
+        else
+            return ( $a < $b ) ? -1 : 1;
+    }
+
+    /**
+     * @access public
+     */
+    public function no_items() {
+        if ( $this->has_items ) {
+            _e( 'No themes found.' );
+        } else {
+            _e( 'You do not appear to have any themes available at this time.' );
+        }
+    }
+
+    /**
+     *
+     * @return array
+     */
+    public function get_columns() {
+        return array(
+            'cb'          => '<input type="checkbox" />',
+            'name'        => __( 'Theme' ),
+            'description' => __( 'Description' ),
+        );
+    }
+
+    /**
+     *
+     * @return array
+     */
+    protected function get_sortable_columns() {
+        return array(
+            'name'         => 'name',
+        );
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 4.3.0
+     * @access protected
+     *
+     * @return string Unalterable name of the primary column name, in this case, 'name'.
+     */
+    protected function get_primary_column_name() {
+        return 'name';
+    }
+
+    /**
+     *
+     * @global array $totals
+     * @global string $status
+     * @return array
+     */
+    protected function get_views() {
+        global $totals, $status;
+
+        $status_links = array();
+        foreach ( $totals as $type => $count ) {
+            if ( !$count )
+                continue;
+
+            switch ( $type ) {
+                case 'all':
+                    $text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes' );
+                    break;
+                case 'enabled':
+                    $text = _n( 'Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count );
+                    break;
+                case 'disabled':
+                    $text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count );
+                    break;
+                case 'upgrade':
+                    $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+                    break;
+                case 'broken' :
+                    $text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
+                    break;
+            }
+
+            if ( $this->is_site_themes )
+                $url = 'site-themes.php?id=' . $this->site_id;
+            else
+                $url = 'themes.php';
+
+            if ( 'search' != $type ) {
+                $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+                    esc_url( add_query_arg('theme_status', $type, $url) ),
+                    ( $type === $status ) ? ' class="current"' : '',
+                    sprintf( $text, number_format_i18n( $count ) )
+                );
+            }
+        }
+
+        return $status_links;
+    }
+
+    /**
+     * @global string $status
+     *
+     * @return array
+     */
+    protected function get_bulk_actions() {
+        global $status;
+
+        $actions = array();
+        if ( 'enabled' != $status )
+            $actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
+        if ( 'disabled' != $status )
+            $actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+        if ( ! $this->is_site_themes ) {
+            if ( current_user_can( 'update_themes' ) )
+                $actions['update-selected'] = __( 'Update' );
+            if ( current_user_can( 'delete_themes' ) )
+                $actions['delete-selected'] = __( 'Delete' );
+        }
+        return $actions;
+    }
+
+    /**
+     * @access public
+     */
+    public function display_rows() {
+        foreach ( $this->items as $theme )
+            $this->single_row( $theme );
+    }
+
+    /**
+     * Handles the checkbox column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param WP_Theme $theme The current WP_Theme object.
+     */
+    public function column_cb( $theme ) {
+        $checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+        ?>
+        <input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
+        <label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+        <?php
+    }
+
+    /**
+     * Handles the name column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @global string $status
+     * @global int    $page
+     * @global string $s
+     *
+     * @param WP_Theme $theme The current WP_Theme object.
+     */
+    public function column_name( $theme ) {
+        global $status, $page, $s;
+
+        $context = $status;
+
+        if ( $this->is_site_themes ) {
+            $url = "site-themes.php?id={$this->site_id}&amp;";
+            $allowed = $theme->is_allowed( 'site', $this->site_id );
+        } else {
+            $url = 'themes.php?';
+            $allowed = $theme->is_allowed( 'network' );
+        }
+
+        // Pre-order.
+        $actions = array(
+            'enable' => '',
+            'disable' => '',
+            'edit' => '',
+            'delete' => ''
+        );
+
+        $stylesheet = $theme->get_stylesheet();
+        $theme_key = urlencode( $stylesheet );
+
+        if ( ! $allowed ) {
+            if ( ! $theme->errors() ) {
+                $url = add_query_arg( array(
+                    'action' => 'enable',
+                    'theme'  => $theme_key,
+                    'paged'  => $page,
+                    's'      => $s,
+                ), $url );
+
+                if ( $this->is_site_themes ) {
+                    /* translators: %s: theme name */
+                    $aria_label = sprintf( __( 'Enable %s' ), $theme->display( 'Name' ) );
+                } else {
+                    /* translators: %s: theme name */
+                    $aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
+                }
+
+                $actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+                    esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
+                    esc_attr( $aria_label ),
+                    ( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
+                );
+            }
+        } else {
+            $url = add_query_arg( array(
+                'action' => 'disable',
+                'theme'  => $theme_key,
+                'paged'  => $page,
+                's'      => $s,
+            ), $url );
+
+            if ( $this->is_site_themes ) {
+                /* translators: %s: theme name */
+                $aria_label = sprintf( __( 'Disable %s' ), $theme->display( 'Name' ) );
+            } else {
+                /* translators: %s: theme name */
+                $aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
+            }
+
+            $actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+                esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
+                esc_attr( $aria_label ),
+                ( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
+            );
+        }
+
+        if ( current_user_can('edit_themes') ) {
+            $url = add_query_arg( array(
+                'theme' => $theme_key,
+            ), 'theme-editor.php' );
+
+            /* translators: %s: theme name */
+            $aria_label = sprintf( __( 'Open %s in the Theme Editor' ), $theme->display( 'Name' ) );
+
+            $actions['edit'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+                esc_url( $url ),
+                esc_attr( $aria_label ),
+                __( 'Edit' )
+            );
+        }
+
+        if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
+            $url = add_query_arg( array(
+                'action'       => 'delete-selected',
+                'checked[]'    => $theme_key,
+                'theme_status' => $context,
+                'paged'        => $page,
+                's'            => $s,
+            ), 'themes.php' );
+
+            /* translators: %s: theme name */
+            $aria_label = sprintf( _x( 'Delete %s', 'theme' ), $theme->display( 'Name' ) );
+
+            $actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
+                esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
+                esc_attr( $aria_label ),
+                __( 'Delete' )
+            );
+        }
+        /**
+         * Filters the action links displayed for each theme in the Multisite
+         * themes list table.
+         *
+         * The action links displayed are determined by the theme's status, and
+         * which Multisite themes list table is being displayed - the Network
+         * themes list table (themes.php), which displays all installed themes,
+         * or the Site themes list table (site-themes.php), which displays the
+         * non-network enabled themes when editing a site in the Network admin.
+         *
+         * The default action links for the Network themes list table include
+         * 'Network Enable', 'Network Disable', 'Edit', and 'Delete'.
+         *
+         * The default action links for the Site themes list table include
+         * 'Enable', 'Disable', and 'Edit'.
+         *
+         * @since 2.8.0
+         *
+         * @param array    $actions An array of action links.
+         * @param WP_Theme $theme   The current WP_Theme object.
+         * @param string   $context Status of the theme.
+         */
+        $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context );
+
+        /**
+         * Filters the action links of a specific theme in the Multisite themes
+         * list table.
+         *
+         * The dynamic portion of the hook name, `$stylesheet`, refers to the
+         * directory name of the theme, which in most cases is synonymous
+         * with the template name.
+         *
+         * @since 3.1.0
+         *
+         * @param array    $actions An array of action links.
+         * @param WP_Theme $theme   The current WP_Theme object.
+         * @param string   $context Status of the theme.
+         */
+        $actions = apply_filters( "theme_action_links_{$stylesheet}", $actions, $theme, $context );
+
+        echo $this->row_actions( $actions, true );
+    }
+
+    /**
+     * Handles the description column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @global string $status
+     * @global array  $totals
+     *
+     * @param WP_Theme $theme The current WP_Theme object.
+     */
+    public function column_description( $theme ) {
+        global $status, $totals;
+        if ( $theme->errors() ) {
+            $pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
+            echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
+        }
+
+        if ( $this->is_site_themes ) {
+            $allowed = $theme->is_allowed( 'site', $this->site_id );
+        } else {
+            $allowed = $theme->is_allowed( 'network' );
+        }
+
+        $class = ! $allowed ? 'inactive' : 'active';
+        if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+            $class .= ' update';
+
+        echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
+            <div class='$class second theme-version-author-uri'>";
+
+        $stylesheet = $theme->get_stylesheet();
+        $theme_meta = array();
+
+        if ( $theme->get('Version') ) {
+            $theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+        }
+        $theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+
+        if ( $theme->get('ThemeURI') ) {
+            /* translators: %s: theme name */
+            $aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
+
+            $theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+                $theme->display( 'ThemeURI' ),
+                esc_attr( $aria_label ),
+                __( 'Visit Theme Site' )
+            );
+        }
+        /**
+         * Filters the array of row meta for each theme in the Multisite themes
+         * list table.
+         *
+         * @since 3.1.0
+         *
+         * @param array    $theme_meta An array of the theme's metadata,
+         *                             including the version, author, and
+         *                             theme URI.
+         * @param string   $stylesheet Directory name of the theme.
+         * @param WP_Theme $theme      WP_Theme object.
+         * @param string   $status     Status of the theme.
+         */
+        $theme_meta = apply_filters( 'theme_row_meta', $theme_meta, $stylesheet, $theme, $status );
+        echo implode( ' | ', $theme_meta );
+
+        echo '</div>';
+    }
+
+    /**
+     * Handles default column output.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param WP_Theme $theme       The current WP_Theme object.
+     * @param string   $column_name The current column name.
+     */
+    public function column_default( $theme, $column_name ) {
+        $stylesheet = $theme->get_stylesheet();
+
+        /**
+         * Fires inside each custom column of the Multisite themes list table.
+         *
+         * @since 3.1.0
+         *
+         * @param string   $column_name Name of the column.
+         * @param string   $stylesheet  Directory name of the theme.
+         * @param WP_Theme $theme       Current WP_Theme object.
+         */
+        do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
+    }
+
+    /**
+     * Handles the output for a single table row.
+     *
+     * @since 4.3.0
+     * @access public
+     *
+     * @param WP_Theme $item The current WP_Theme object.
+     */
+    public function single_row_columns( $item ) {
+        list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+
+        foreach ( $columns as $column_name => $column_display_name ) {
+            $extra_classes = '';
+            if ( in_array( $column_name, $hidden ) ) {
+                $extra_classes .= ' hidden';
+            }
+
+            switch ( $column_name ) {
+                case 'cb':
+                    echo '<th scope="row" class="check-column">';
+
+                    $this->column_cb( $item );
+
+                    echo '</th>';
+                    break;
+
+                case 'name':
+                    echo "<td class='theme-title column-primary{$extra_classes}'><strong>" . $item->display('Name') . "</strong>";
+
+                    $this->column_name( $item );
+
+                    echo "</td>";
+                    break;
+
+                case 'description':
+                    echo "<td class='column-description desc{$extra_classes}'>";
+
+                    $this->column_description( $item );
+
+                    echo '</td>';
+                    break;
+
+                default:
+                    echo "<td class='$column_name column-$column_name{$extra_classes}'>";
+
+                    $this->column_default( $item, $column_name );
+
+                    echo "</td>";
+                    break;
+            }
+        }
+    }
+
+    /**
+     * @global string $status
+     * @global array  $totals
+     *
+     * @param WP_Theme $theme
+     */
+    public function single_row( $theme ) {
+        global $status, $totals;
+
+        if ( $this->is_site_themes ) {
+            $allowed = $theme->is_allowed( 'site', $this->site_id );
+        } else {
+            $allowed = $theme->is_allowed( 'network' );
+        }
+
+        $stylesheet = $theme->get_stylesheet();
+
+        $class = ! $allowed ? 'inactive' : 'active';
+        if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
+            $class .= ' update';
+        }
+
+        printf( '<tr class="%s" data-slug="%s">',
+            esc_attr( $class ),
+            esc_attr( $stylesheet )
+        );
+
+        $this->single_row_columns( $theme );
+
+        echo "</tr>";
+
+        if ( $this->is_site_themes )
+            remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+
+        /**
+         * Fires after each row in the Multisite themes list table.
+         *
+         * @since 3.1.0
+         *
+         * @param string   $stylesheet Directory name of the theme.
+         * @param WP_Theme $theme      Current WP_Theme object.
+         * @param string   $status     Status of the theme.
+         */
+        do_action( 'after_theme_row', $stylesheet, $theme, $status );
+
+        /**
+         * Fires after each specific row in the Multisite themes list table.
+         *
+         * The dynamic portion of the hook name, `$stylesheet`, refers to the
+         * directory name of the theme, most often synonymous with the template
+         * name of the theme.
+         *
+         * @since 3.5.0
+         *
+         * @param string   $stylesheet Directory name of the theme.
+         * @param WP_Theme $theme      Current WP_Theme object.
+         * @param string   $status     Status of the theme.
+         */
+        do_action( "after_theme_row_{$stylesheet}", $stylesheet, $theme, $status );
+    }
 }

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

@@ -17 +17 @@
  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
 
-        public $order = 'ASC';
-        public $orderby = null;
-        public $groups = array();
-
-        private $error;
-
-        /**
-         *
-         * @return bool
-         */
-        public function ajax_user_can() {
-                return current_user_can('install_plugins');
-        }
-
-        /**
-         * Return a list of slugs of installed plugins, if known.
-         *
-         * Uses the transient data from the updates API to determine the slugs of
-         * known installed plugins. This might be better elsewhere, perhaps even
-         * within get_plugins().
-         *
-         * @since 4.0.0
-         * @access protected
-         *
-         * @return array
-         */
-        protected function get_installed_plugin_slugs() {
-                $slugs = array();
-
-                $plugin_info = get_site_transient( 'update_plugins' );
-                if ( isset( $plugin_info->no_update ) ) {
-                        foreach ( $plugin_info->no_update as $plugin ) {
-                                $slugs[] = $plugin->slug;
-                        }
-                }
-
-                if ( isset( $plugin_info->response ) ) {
-                        foreach ( $plugin_info->response as $plugin ) {
-                                $slugs[] = $plugin->slug;
-                        }
-                }
-
-                return $slugs;
-        }
-
-        /**
-         *
-         * @global array  $tabs
-         * @global string $tab
-         * @global int    $paged
-         * @global string $type
-         * @global string $term
-         */
-        public function prepare_items() {
-                include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-
-                global $tabs, $tab, $paged, $type, $term;
-
-                wp_reset_vars( array( 'tab' ) );
-
-                $paged = $this->get_pagenum();
-
-                $per_page = 30;
-
-                // These are the tabs which are shown on the page
-                $tabs = array();
-
-                if ( 'search' === $tab ) {
-                        $tabs['search'] = __( 'Search Results' );
-                }
-                if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
-                        $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().
-                        $tabs['upload'] = __( 'Upload Plugin' );
-                }
-
-                $nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
-
-                /**
-                 * Filters the tabs shown on the Plugin Install screen.
-                 *
-                 * @since 2.7.0
-                 *
-                 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
-                 *                    'recommended', 'favorites', and 'upload'.
-                 */
-                $tabs = apply_filters( 'install_plugins_tabs', $tabs );
-
-                /**
-                 * Filters tabs not associated with a menu item on the Plugin Install screen.
-                 *
-                 * @since 2.7.0
-                 *
-                 * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
-                 */
-                $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
-
-                // If a non-valid menu tab has been selected, And it's not a non-menu action.
-                if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-                        $tab = key( $tabs );
-
-                $args = array(
-                        'page' => $paged,
-                        'per_page' => $per_page,
-                        'fields' => array(
-                                'last_updated' => true,
-                                'icons' => true,
-                                'active_installs' => true
-                        ),
-                        // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
-                        'locale' => get_user_locale(),
-                        'installed_plugins' => $this->get_installed_plugin_slugs(),
-                );
-
-                switch ( $tab ) {
-                        case 'search':
-                                $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-                                $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-
-                                switch ( $type ) {
-                                        case 'tag':
-                                                $args['tag'] = sanitize_title_with_dashes( $term );
-                                                break;
-                                        case 'term':
-                                                $args['search'] = $term;
-                                                break;
-                                        case 'author':
-                                                $args['author'] = $term;
-                                                break;
-                                }
-
-                                break;
-
-                        case 'featured':
-                                $args['fields']['group'] = true;
-                                $this->orderby = 'group';
-                                // No break!
-                        case 'popular':
-                        case 'new':
-                        case 'beta':
-                        case 'recommended':
-                                $args['browse'] = $tab;
-                                break;
-
-                        case 'favorites':
-                                $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
-                                        $args = false;
-
-                                add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
-                                break;
-
-                        default:
-                                $args = false;
-                                break;
-                }
-
-                /**
-                 * Filters API request arguments for each Plugin Install screen tab.
-                 *
-                 * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
-                 * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
-                 *
-                 * @since 3.7.0
-                 *
-                 * @param array|bool $args Plugin Install API arguments.
-                 */
-                $args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
-
-                if ( !$args )
-                        return;
-
-                $api = plugins_api( 'query_plugins', $args );
-
-                if ( is_wp_error( $api ) ) {
-                        $this->error = $api;
-                        return;
-                }
-
-                $this->items = $api->plugins;
-
-                if ( $this->orderby ) {
-                        uasort( $this->items, array( $this, 'order_callback' ) );
-                }
-
-                $this->set_pagination_args( array(
-                        'total_items' => $api->info['results'],
-                        'per_page' => $args['per_page'],
-                ) );
-
-                if ( isset( $api->info['groups'] ) ) {
-                        $this->groups = $api->info['groups'];
-                }
-        }
-
-        /**
-         * @access public
-         */
-        public function no_items() {
-                if ( isset( $this->error ) ) {
-                        $message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
-                } else {
-                        $message = __( 'No plugins match your request.' );
-                }
-                echo '<div class="no-plugin-results">' . $message . '</div>';
-        }
-
-        /**
-         *
-         * @global array $tabs
-         * @global string $tab
-         *
-         * @return array
-         */
-        protected function get_views() {
-                global $tabs, $tab;
-
-                $display_tabs = array();
-                foreach ( (array) $tabs as $action => $text ) {
-                        $class = ( $action === $tab ) ? ' current' : '';
-                        $href = self_admin_url('plugin-install.php?tab=' . $action);
-                        $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
-                }
-                // No longer a real tab.
-                unset( $display_tabs['plugin-install-upload'] );
-
-                return $display_tabs;
-        }
-
-        /**
-         * Override parent views so we can use the filter bar display.
-         */
-        public function views() {
-                $views = $this->get_views();
-
-                /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-                $views = apply_filters( "views_{$this->screen->id}", $views );
-
-                $this->screen->render_screen_reader_content( 'heading_views' );
+    public $order = 'ASC';
+    public $orderby = null;
+    public $groups = array();
+
+    private $error;
+
+    /**
+     *
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can('install_plugins');
+    }
+
+    /**
+     * Return a list of slugs of installed plugins, if known.
+     *
+     * Uses the transient data from the updates API to determine the slugs of
+     * known installed plugins. This might be better elsewhere, perhaps even
+     * within get_plugins().
+     *
+     * @since 4.0.0
+     * @access protected
+     *
+     * @return array
+     */
+    protected function get_installed_plugin_slugs() {
+        $slugs = array();
+
+        $plugin_info = get_site_transient( 'update_plugins' );
+        if ( isset( $plugin_info->no_update ) ) {
+            foreach ( $plugin_info->no_update as $plugin ) {
+                $slugs[] = $plugin->slug;
+            }
+        }
+
+        if ( isset( $plugin_info->response ) ) {
+            foreach ( $plugin_info->response as $plugin ) {
+                $slugs[] = $plugin->slug;
+            }
+        }
+
+        return $slugs;
+    }
+
+    public function prepare_items() {
+        include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+
+        $tab = wp_assign_request_var('tab');
+        $type = wp_assign_request_var('type');
+        $term = wp_assign_request_var('term');
+
+        $paged = $this->get_pagenum();
+
+        $per_page = 30;
+
+        // These are the tabs which are shown on the page
+        $tabs = array();
+
+        if ( 'search' === $tab ) {
+            $tabs['search'] = __( 'Search Results' );
+        }
+        if ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
+            $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().
+            $tabs['upload'] = __( 'Upload Plugin' );
+        }
+
+        $nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
+
+        /**
+         * Filters the tabs shown on the Plugin Install screen.
+         *
+         * @since 2.7.0
+         *
+         * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
+         *                    'recommended', 'favorites', and 'upload'.
+         */
+        $tabs = apply_filters( 'install_plugins_tabs', $tabs );
+
+        /**
+         * Filters tabs not associated with a menu item on the Plugin Install screen.
+         *
+         * @since 2.7.0
+         *
+         * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
+         */
+        $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
+
+        // If a non-valid menu tab has been selected, And it's not a non-menu action.
+        if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
+            $tab = key( $tabs );
+
+        $args = array(
+            'page' => $paged,
+            'per_page' => $per_page,
+            'fields' => array(
+                'last_updated' => true,
+                'icons' => true,
+                'active_installs' => true
+            ),
+            // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
+            'locale' => get_user_locale(),
+            'installed_plugins' => $this->get_installed_plugin_slugs(),
+        );
+
+        switch ( $tab ) {
+            case 'search':
+                $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
+                $term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+
+                switch ( $type ) {
+                    case 'tag':
+                        $args['tag'] = sanitize_title_with_dashes( $term );
+                        break;
+                    case 'term':
+                        $args['search'] = $term;
+                        break;
+                    case 'author':
+                        $args['author'] = $term;
+                        break;
+                }
+
+                break;
+
+            case 'featured':
+                $args['fields']['group'] = true;
+                $this->orderby = 'group';
+                // No break!
+            case 'popular':
+            case 'new':
+            case 'beta':
+            case 'recommended':
+                $args['browse'] = $tab;
+                break;
+
+            case 'favorites':
+                $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
+                    $args = false;
+
+                add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
+                break;
+
+            default:
+                $args = false;
+                break;
+        }
+
+        /**
+         * Filters API request arguments for each Plugin Install screen tab.
+         *
+         * The dynamic portion of the hook name, `$tab`, refers to the plugin install tabs.
+         * Default tabs include 'featured', 'popular', 'recommended', 'favorites', and 'upload'.
+         *
+         * @since 3.7.0
+         *
+         * @param array|bool $args Plugin Install API arguments.
+         */
+        $args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
+
+        if ( !$args )
+            return;
+
+        $api = plugins_api( 'query_plugins', $args );
+
+        if ( is_wp_error( $api ) ) {
+            $this->error = $api;
+            return;
+        }
+
+        $this->items = $api->plugins;
+
+        if ( $this->orderby ) {
+            uasort( $this->items, array( $this, 'order_callback' ) );
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $api->info['results'],
+            'per_page' => $args['per_page'],
+        ) );
+
+        if ( isset( $api->info['groups'] ) ) {
+            $this->groups = $api->info['groups'];
+        }
+    }
+
+    /**
+     * @access public
+     */
+    public function no_items() {
+        if ( isset( $this->error ) ) {
+            $message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+        } else {
+            $message = __( 'No plugins match your request.' );
+        }
+        echo '<div class="no-plugin-results">' . $message . '</div>';
+    }
+
+    /**
+     *
+     * @global array $tabs
+     * @global string $tab
+     *
+     * @return array
+     */
+    protected function get_views() {
+        global $tabs, $tab;
+
+        $display_tabs = array();
+        foreach ( (array) $tabs as $action => $text ) {
+            $class = ( $action === $tab ) ? ' current' : '';
+            $href = self_admin_url('plugin-install.php?tab=' . $action);
+            $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
+        }
+        // No longer a real tab.
+        unset( $display_tabs['plugin-install-upload'] );
+
+        return $display_tabs;
+    }
+
+    /**
+     * Override parent views so we can use the filter bar display.
+     */
+    public function views() {
+        $views = $this->get_views();
+
+        /** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+        $views = apply_filters( "views_{$this->screen->id}", $views );
+
+        $this->screen->render_screen_reader_content( 'heading_views' );
 ?>
 <div class="wp-filter">
-        <ul class="filter-links">
-                <?php
-                if ( ! empty( $views ) ) {
-                        foreach ( $views as $class => $view ) {
-                                $views[ $class ] = "\t<li class='$class'>$view";
-                        }
-                        echo implode( " </li>\n", $views ) . "</li>\n";
-                }
-                ?>
-        </ul>
-
-        <?php install_search_form(); ?>
+    <ul class="filter-links">
+        <?php
+        if ( ! empty( $views ) ) {
+            foreach ( $views as $class => $view ) {
+                $views[ $class ] = "\t<li class='$class'>$view";
+            }
+            echo implode( " </li>\n", $views ) . "</li>\n";
+        }
+        ?>
+    </ul>
+
+    <?php install_search_form(); ?>
 </div>
 <?php
-        }
+    }
 
-        /**
-         * Override the parent display() so we can provide a different container.
-         */
-        public function display() {
-                $singular = $this->_args['singular'];
+    /**
+     * Override the parent display() so we can provide a different container.
+     */
+    public function display() {
+        $singular = $this->_args['singular'];
 
-                $data_attr = '';
+        $data_attr = '';
 
-                if ( $singular ) {
-                        $data_attr = " data-wp-lists='list:$singular'";
-                }
+        if ( $singular ) {
+            $data_attr = " data-wp-lists='list:$singular'";
+        }
 
-                $this->display_tablenav( 'top' );
+        $this->display_tablenav( 'top' );
 
 ?>
 <div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
 <?php
-        $this->screen->render_screen_reader_content( 'heading_list' );
+    $this->screen->render_screen_reader_content( 'heading_list' );
 ?>
-        <div id="the-list"<?php echo $data_attr; ?>>
-                <?php $this->display_rows_or_placeholder(); ?>
-        </div>
+    <div id="the-list"<?php echo $data_attr; ?>>
+        <?php $this->display_rows_or_placeholder(); ?>
+    </div>
 </div>
 <?php
-                $this->display_tablenav( 'bottom' );
-        }
-
-        /**
-         * @global string $tab
-         *
-         * @param string $which
-         */
-        protected function display_tablenav( $which ) {
-                if ( $GLOBALS['tab'] === 'featured' ) {
-                        return;
-                }
-
-                if ( 'top' === $which ) {
-                        wp_referer_field();
-                ?>
-                        <div class="tablenav top">
-                                <div class="alignleft actions">
-                                        <?php
-                                        /**
-                                         * Fires before the Plugin Install table header pagination is displayed.
-                                         *
-                                         * @since 2.7.0
-                                         */
-                                        do_action( 'install_plugins_table_header' ); ?>
-                                </div>
-                                <?php $this->pagination( $which ); ?>
-                                <br class="clear" />
-                        </div>
-                <?php } else { ?>
-                        <div class="tablenav bottom">
-                                <?php $this->pagination( $which ); ?>
-                                <br class="clear" />
-                        </div>
-                <?php
-                }
-        }
-
-        /**
-         * @return array
-         */
-        protected function get_table_classes() {
-                return array( 'widefat', $this->_args['plural'] );
-        }
-
-        /**
-         * @return array
-         */
-        public function get_columns() {
-                return array();
-        }
-
-        /**
-         * @param object $plugin_a
-         * @param object $plugin_b
-         * @return int
-         */
-        private function order_callback( $plugin_a, $plugin_b ) {
-                $orderby = $this->orderby;
-                if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
-                        return 0;
-                }
-
-                $a = $plugin_a->$orderby;
-                $b = $plugin_b->$orderby;
-
-                if ( $a == $b ) {
-                        return 0;
-                }
-
-                if ( 'DESC' === $this->order ) {
-                        return ( $a < $b ) ? 1 : -1;
-                } else {
-                        return ( $a < $b ) ? -1 : 1;
-                }
-        }
-
-        public function display_rows() {
-                $plugins_allowedtags = array(
-                        'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
-                        'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
-                        'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
-                        'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
-                );
-
-                $plugins_group_titles = array(
-                        'Performance' => _x( 'Performance', 'Plugin installer group title' ),
-                        'Social'      => _x( 'Social',      'Plugin installer group title' ),
-                        'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
-                );
-
-                $group = null;
-
-                foreach ( (array) $this->items as $plugin ) {
-                        if ( is_object( $plugin ) ) {
-                                $plugin = (array) $plugin;
-                        }
-
-                        // Display the group heading if there is one
-                        if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
-                                if ( isset( $this->groups[ $plugin['group'] ] ) ) {
-                                        $group_name = $this->groups[ $plugin['group'] ];
-                                        if ( isset( $plugins_group_titles[ $group_name ] ) ) {
-                                                $group_name = $plugins_group_titles[ $group_name ];
-                                        }
-                                } else {
-                                        $group_name = $plugin['group'];
-                                }
-
-                                // Starting a new group, close off the divs of the last one
-                                if ( ! empty( $group ) ) {
-                                        echo '</div></div>';
-                                }
-
-                                echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
-                                // needs an extra wrapping div for nth-child selectors to work
-                                echo '<div class="plugin-items">';
-
-                                $group = $plugin['group'];
-                        }
-                        $title = wp_kses( $plugin['name'], $plugins_allowedtags );
-
-                        // Remove any HTML from the description.
-                        $description = strip_tags( $plugin['short_description'] );
-                        $version = wp_kses( $plugin['version'], $plugins_allowedtags );
-
-                        $name = strip_tags( $title . ' ' . $version );
-
-                        $author = wp_kses( $plugin['author'], $plugins_allowedtags );
-                        if ( ! empty( $author ) ) {
-                                $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
-                        }
-
-                        $action_links = array();
-
-                        if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
-                                $status = install_plugin_install_status( $plugin );
-
-                                switch ( $status['status'] ) {
-                                        case 'install':
-                                                if ( $status['url'] ) {
-                                                        /* translators: 1: Plugin name and version. */
-                                                        $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
-                                                }
-                                                break;
-
-                                        case 'update_available':
-                                                if ( $status['url'] ) {
-                                                        /* translators: 1: Plugin name and version */
-                                                        $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':
-                                                if ( is_plugin_active( $status['file'] ) ) {
-                                                        $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
-                                                } elseif ( current_user_can( 'activate_plugins' ) ) {
-                                                        $button_text  = __( 'Activate' );
-                                                        /* translators: %s: Plugin name */
-                                                        $button_label = _x( 'Activate %s', 'plugin' );
-                                                        $activate_url = add_query_arg( array(
-                                                                '_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
-                                                                'action'      => 'activate',
-                                                                'plugin'      => $status['file'],
-                                                        ), network_admin_url( 'plugins.php' ) );
-
-                                                        if ( is_network_admin() ) {
-                                                                $button_text  = __( 'Network Activate' );
-                                                                /* translators: %s: Plugin name */
-                                                                $button_label = _x( 'Network Activate %s', 'plugin' );
-                                                                $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
-                                                        }
-
-                                                        $action_links[] = sprintf(
-                                                                '<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
-                                                                esc_url( $activate_url ),
-                                                                esc_attr( sprintf( $button_label, $plugin['name'] ) ),
-                                                                $button_text
-                                                        );
-                                                } else {
-                                                        $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
-                                                }
-                                                break;
-                                }
-                        }
-
-                        $details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-                                                                '&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 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'];
-                        } elseif ( !empty( $plugin['icons']['2x'] ) ) {
-                                $plugin_icon_url = $plugin['icons']['2x'];
-                        } elseif ( !empty( $plugin['icons']['1x'] ) ) {
-                                $plugin_icon_url = $plugin['icons']['1x'];
-                        } else {
-                                $plugin_icon_url = $plugin['icons']['default'];
-                        }
-
-                        /**
-                         * Filters the install action links for a plugin.
-                         *
-                         * @since 2.7.0
-                         *
-                         * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now.
-                         * @param array $plugin       The plugin currently being listed.
-                         */
-                        $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
-
-                        $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 open-plugin-details-modal">
-                                                <?php echo $title; ?>
-                                                <img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
-                                                </a>
-                                        </h3>
-                                </div>
-                                <div class="action-links">
-                                        <?php
-                                                if ( $action_links ) {
-                                                        echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
-                                                }
-                                        ?>
-                                </div>
-                                <div class="desc column-description">
-                                        <p><?php echo $description; ?></p>
-                                        <p class="authors"><?php echo $author; ?></p>
-                                </div>
-                        </div>
-                        <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" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
-                                </div>
-                                <div class="column-updated">
-                                        <strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
-                                </div>
-                                <div class="column-downloaded">
-                                        <?php
-                                        if ( $plugin['active_installs'] >= 1000000 ) {
-                                                $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
-                                        } elseif ( 0 == $plugin['active_installs'] ) {
-                                                $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
-                                        } else {
-                                                $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
-                                        }
-                                        printf( __( '%s Active Installs' ), $active_installs_text );
-                                        ?>
-                                </div>
-                                <div class="column-compatibility">
-                                        <?php
-                                        $wp_version = get_bloginfo( 'version' );
-
-                                        if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
-                                                echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
-                                        } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
-                                                echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
-                                        } else {
-                                                echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
-                                        }
-                                        ?>
-                                </div>
-                        </div>
-                </div>
-                <?php
-                }
-
-                // Close off the group divs of the last one
-                if ( ! empty( $group ) ) {
-                        echo '</div></div>';
-                }
-        }
+        $this->display_tablenav( 'bottom' );
+    }
+
+    /**
+     * @global string $tab
+     *
+     * @param string $which
+     */
+    protected function display_tablenav( $which ) {
+        if ( $GLOBALS['tab'] === 'featured' ) {
+            return;
+        }
+
+        if ( 'top' === $which ) {
+            wp_referer_field();
+        ?>
+            <div class="tablenav top">
+                <div class="alignleft actions">
+                    <?php
+                    /**
+                     * Fires before the Plugin Install table header pagination is displayed.
+                     *
+                     * @since 2.7.0
+                     */
+                    do_action( 'install_plugins_table_header' ); ?>
+                </div>
+                <?php $this->pagination( $which ); ?>
+                <br class="clear" />
+            </div>
+        <?php } else { ?>
+            <div class="tablenav bottom">
+                <?php $this->pagination( $which ); ?>
+                <br class="clear" />
+            </div>
+        <?php
+        }
+    }
+
+    /**
+     * @return array
+     */
+    protected function get_table_classes() {
+        return array( 'widefat', $this->_args['plural'] );
+    }
+
+    /**
+     * @return array
+     */
+    public function get_columns() {
+        return array();
+    }
+
+    /**
+     * @param object $plugin_a
+     * @param object $plugin_b
+     * @return int
+     */
+    private function order_callback( $plugin_a, $plugin_b ) {
+        $orderby = $this->orderby;
+        if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+            return 0;
+        }
+
+        $a = $plugin_a->$orderby;
+        $b = $plugin_b->$orderby;
+
+        if ( $a == $b ) {
+            return 0;
+        }
+
+        if ( 'DESC' === $this->order ) {
+            return ( $a < $b ) ? 1 : -1;
+        } else {
+            return ( $a < $b ) ? -1 : 1;
+        }
+    }
+
+    public function display_rows() {
+        $plugins_allowedtags = array(
+            'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
+            'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
+            'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+            'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
+        );
+
+        $plugins_group_titles = array(
+            'Performance' => _x( 'Performance', 'Plugin installer group title' ),
+            'Social'      => _x( 'Social',      'Plugin installer group title' ),
+            'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+        );
+
+        $group = null;
+
+        foreach ( (array) $this->items as $plugin ) {
+            if ( is_object( $plugin ) ) {
+                $plugin = (array) $plugin;
+            }
+
+            // Display the group heading if there is one
+            if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
+                if ( isset( $this->groups[ $plugin['group'] ] ) ) {
+                    $group_name = $this->groups[ $plugin['group'] ];
+                    if ( isset( $plugins_group_titles[ $group_name ] ) ) {
+                        $group_name = $plugins_group_titles[ $group_name ];
+                    }
+                } else {
+                    $group_name = $plugin['group'];
+                }
+
+                // Starting a new group, close off the divs of the last one
+                if ( ! empty( $group ) ) {
+                    echo '</div></div>';
+                }
+
+                echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+                // needs an extra wrapping div for nth-child selectors to work
+                echo '<div class="plugin-items">';
+
+                $group = $plugin['group'];
+            }
+            $title = wp_kses( $plugin['name'], $plugins_allowedtags );
+
+            // Remove any HTML from the description.
+            $description = strip_tags( $plugin['short_description'] );
+            $version = wp_kses( $plugin['version'], $plugins_allowedtags );
+
+            $name = strip_tags( $title . ' ' . $version );
+
+            $author = wp_kses( $plugin['author'], $plugins_allowedtags );
+            if ( ! empty( $author ) ) {
+                $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+            }
+
+            $action_links = array();
+
+            if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
+                $status = install_plugin_install_status( $plugin );
+
+                switch ( $status['status'] ) {
+                    case 'install':
+                        if ( $status['url'] ) {
+                            /* translators: 1: Plugin name and version. */
+                            $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+                        }
+                        break;
+
+                    case 'update_available':
+                        if ( $status['url'] ) {
+                            /* translators: 1: Plugin name and version */
+                            $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':
+                        if ( is_plugin_active( $status['file'] ) ) {
+                            $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
+                        } elseif ( current_user_can( 'activate_plugins' ) ) {
+                            $button_text  = __( 'Activate' );
+                            /* translators: %s: Plugin name */
+                            $button_label = _x( 'Activate %s', 'plugin' );
+                            $activate_url = add_query_arg( array(
+                                '_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+                                'action'      => 'activate',
+                                'plugin'      => $status['file'],
+                            ), network_admin_url( 'plugins.php' ) );
+
+                            if ( is_network_admin() ) {
+                                $button_text  = __( 'Network Activate' );
+                                /* translators: %s: Plugin name */
+                                $button_label = _x( 'Network Activate %s', 'plugin' );
+                                $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
+                            }
+
+                            $action_links[] = sprintf(
+                                '<a href="%1$s" class="button activate-now" aria-label="%2$s">%3$s</a>',
+                                esc_url( $activate_url ),
+                                esc_attr( sprintf( $button_label, $plugin['name'] ) ),
+                                $button_text
+                            );
+                        } else {
+                            $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
+                        }
+                        break;
+                }
+            }
+
+            $details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
+                                '&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 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'];
+            } elseif ( !empty( $plugin['icons']['2x'] ) ) {
+                $plugin_icon_url = $plugin['icons']['2x'];
+            } elseif ( !empty( $plugin['icons']['1x'] ) ) {
+                $plugin_icon_url = $plugin['icons']['1x'];
+            } else {
+                $plugin_icon_url = $plugin['icons']['default'];
+            }
+
+            /**
+             * Filters the install action links for a plugin.
+             *
+             * @since 2.7.0
+             *
+             * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now.
+             * @param array $plugin       The plugin currently being listed.
+             */
+            $action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+
+            $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 open-plugin-details-modal">
+                        <?php echo $title; ?>
+                        <img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+                        </a>
+                    </h3>
+                </div>
+                <div class="action-links">
+                    <?php
+                        if ( $action_links ) {
+                            echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+                        }
+                    ?>
+                </div>
+                <div class="desc column-description">
+                    <p><?php echo $description; ?></p>
+                    <p class="authors"><?php echo $author; ?></p>
+                </div>
+            </div>
+            <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" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+                </div>
+                <div class="column-updated">
+                    <strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+                </div>
+                <div class="column-downloaded">
+                    <?php
+                    if ( $plugin['active_installs'] >= 1000000 ) {
+                        $active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+                    } elseif ( 0 == $plugin['active_installs'] ) {
+                        $active_installs_text = _x( 'Less Than 10', 'Active plugin installs' );
+                    } else {
+                        $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+                    }
+                    printf( __( '%s Active Installs' ), $active_installs_text );
+                    ?>
+                </div>
+                <div class="column-compatibility">
+                    <?php
+                    $wp_version = get_bloginfo( 'version' );
+
+                    if ( ! empty( $plugin['tested'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
+                        echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
+                    } elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $wp_version, 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
+                        echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+                    } else {
+                        echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+                    }
+                    ?>
+                </div>
+            </div>
+        </div>
+        <?php
+        }
+
+        // Close off the group divs of the last one
+        if ( ! empty( $group ) ) {
+            echo '</div></div>';
+        }
+    }
 }

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

@@ -17 +17 @@
  */
 class WP_Plugins_List_Table extends WP_List_Table {
 
-        /**
-         * Constructor.
-         *
-         * @since 3.1.0
-         * @access public
-         *
-         * @see WP_List_Table::__construct() for more information on default arguments.
-         *
-         * @global string $status
-         * @global int    $page
-         *
-         * @param array $args An associative array of arguments.
-         */
-        public function __construct( $args = array() ) {
-                global $status, $page;
-
-                parent::__construct( array(
-                        'plural' => 'plugins',
-                        'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-                ) );
-
-                $status = 'all';
-                if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-                        $status = $_REQUEST['plugin_status'];
-
-                if ( isset($_REQUEST['s']) )
-                        $_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
-
-                $page = $this->get_pagenum();
-        }
-
-        /**
-         * @return array
-         */
-        protected function get_table_classes() {
-                return array( 'widefat', $this->_args['plural'] );
-        }
-
-        /**
-         * @return bool
-         */
-        public function ajax_user_can() {
-                return current_user_can('activate_plugins');
-        }
-
-        /**
-         *
-         * @global string $status
-         * @global array  $plugins
-         * @global array  $totals
-         * @global int    $page
-         * @global string $orderby
-         * @global string $order
-         * @global string $s
-         */
-        public function prepare_items() {
-                global $status, $plugins, $totals, $page, $orderby, $order, $s;
-
-                wp_reset_vars( array( 'orderby', 'order' ) );
-
-                /**
-                 * Filters the full array of plugins to list in the Plugins list table.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @see get_plugins()
-                 *
-                 * @param array $all_plugins An array of plugins to display in the list table.
-                 */
-                $all_plugins = apply_filters( 'all_plugins', get_plugins() );
-
-                $plugins = array(
-                        'all'                => $all_plugins,
-                        'search'             => array(),
-                        'active'             => array(),
-                        'inactive'           => array(),
-                        'recently_activated' => array(),
-                        'upgrade'            => array(),
-                        'mustuse'            => array(),
-                        'dropins'            => array(),
-                );
-
-                $screen = $this->screen;
-
-                if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
-
-                        /**
-                         * Filters whether to display the advanced plugins list table.
-                         *
-                         * There are two types of advanced plugins - must-use and drop-ins -
-                         * which can be used in a single site or Multisite network.
-                         *
-                         * The $type parameter allows you to differentiate between the type of advanced
-                         * plugins to filter the display of. Contexts include 'mustuse' and 'dropins'.
-                         *
-                         * @since 3.0.0
-                         *
-                         * @param bool   $show Whether to show the advanced plugins for the specified
-                         *                     plugin type. Default true.
-                         * @param string $type The plugin type. Accepts 'mustuse', 'dropins'.
-                         */
-                        if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) ) {
-                                $plugins['mustuse'] = get_mu_plugins();
-                        }
-
-                        /** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-                        if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-                                $plugins['dropins'] = get_dropins();
-
-                        if ( current_user_can( 'update_plugins' ) ) {
-                                $current = get_site_transient( 'update_plugins' );
-                                foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-                                        if ( isset( $current->response[ $plugin_file ] ) ) {
-                                                $plugins['all'][ $plugin_file ]['update'] = true;
-                                                $plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
-                                        }
-                                }
-                        }
-                }
-
-                if ( ! $screen->in_admin( 'network' ) ) {
-                        $show = current_user_can( 'manage_network_plugins' );
-                        /**
-                         * Filters whether to display network-active plugins alongside plugins active for the current site.
-                         *
-                         * This also controls the display of inactive network-only plugins (plugins with
-                         * "Network: true" in the plugin header).
-                         *
-                         * Plugins cannot be network-activated or network-deactivated from this screen.
-                         *
-                         * @since 4.4.0
-                         *
-                         * @param bool $show Whether to show network-active plugins. Default is whether the current
-                         *                   user can manage network plugins (ie. a Super Admin).
-                         */
-                        $show_network_active = apply_filters( 'show_network_active_plugins', $show );
-                }
-
-                set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
-
-                if ( $screen->in_admin( 'network' ) ) {
-                        $recently_activated = get_site_option( 'recently_activated', array() );
-                } else {
-                        $recently_activated = get_option( 'recently_activated', array() );
-                }
-
-                foreach ( $recently_activated as $key => $time ) {
-                        if ( $time + WEEK_IN_SECONDS < time() ) {
-                                unset( $recently_activated[$key] );
-                        }
-                }
-
-                if ( $screen->in_admin( 'network' ) ) {
-                        update_site_option( 'recently_activated', $recently_activated );
-                } else {
-                        update_option( 'recently_activated', $recently_activated );
-                }
-
-                $plugin_info = get_site_transient( 'update_plugins' );
-
-                foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-                        // Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
-                        if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
-                                $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
-                                // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-                                if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-                                        $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
-                                }
-
-                        } elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
-                                $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
-                                // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-                                if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-                                        $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
-                                }
-                        }
-
-                        // Filter into individual sections
-                        if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
-                                if ( $show_network_active ) {
-                                        // On the non-network screen, show inactive network-only plugins if allowed
-                                        $plugins['inactive'][ $plugin_file ] = $plugin_data;
-                                } else {
-                                        // On the non-network screen, filter out network-only plugins as long as they're not individually active
-                                        unset( $plugins['all'][ $plugin_file ] );
-                                }
-                        } elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
-                                if ( $show_network_active ) {
-                                        // On the non-network screen, show network-active plugins if allowed
-                                        $plugins['active'][ $plugin_file ] = $plugin_data;
-                                } else {
-                                        // On the non-network screen, filter out network-active plugins
-                                        unset( $plugins['all'][ $plugin_file ] );
-                                }
-                        } elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
-                                || ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
-                                // On the non-network screen, populate the active list with plugins that are individually activated
-                                // On the network-admin screen, populate the active list with plugins that are network activated
-                                $plugins['active'][ $plugin_file ] = $plugin_data;
-                        } else {
-                                if ( isset( $recently_activated[ $plugin_file ] ) ) {
-                                        // Populate the recently activated list with plugins that have been recently activated
-                                        $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
-                                }
-                                // Populate the inactive list with plugins that aren't activated
-                                $plugins['inactive'][ $plugin_file ] = $plugin_data;
-                        }
-                }
-
-                if ( strlen( $s ) ) {
-                        $status = 'search';
-                        $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
-                }
-
-                $totals = array();
-                foreach ( $plugins as $type => $list )
-                        $totals[ $type ] = count( $list );
-
-                if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-                        $status = 'all';
-
-                $this->items = array();
-                foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
-                        // Translate, Don't Apply Markup, Sanitize HTML
-                        $this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
-                }
-
-                $total_this_page = $totals[ $status ];
-
-                $js_plugins = array();
-                foreach ( $plugins as $key => $list ) {
-                        $js_plugins[ $key ] = array_keys( (array) $list );
-                }
-
-                wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-                        'plugins' => $js_plugins,
-                        'totals'  => wp_get_update_data(),
-                ) );
-
-                if ( ! $orderby ) {
-                        $orderby = 'Name';
-                } else {
-                        $orderby = ucfirst( $orderby );
-                }
-
-                $order = strtoupper( $order );
-
-                uasort( $this->items, array( $this, '_order_callback' ) );
-
-                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
-
-                $start = ( $page - 1 ) * $plugins_per_page;
-
-                if ( $total_this_page > $plugins_per_page )
-                        $this->items = array_slice( $this->items, $start, $plugins_per_page );
-
-                $this->set_pagination_args( array(
-                        'total_items' => $total_this_page,
-                        'per_page' => $plugins_per_page,
-                ) );
-        }
-
-        /**
-         * @global string $s URL encoded search term.
-         *
-         * @param array $plugin
-         * @return bool
-         */
-        public function _search_callback( $plugin ) {
-                global $s;
-
-                foreach ( $plugin as $value ) {
-                        if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
-                                return true;
-                        }
-                }
-
-                return false;
-        }
-
-        /**
-         * @global string $orderby
-         * @global string $order
-         * @param array $plugin_a
-         * @param array $plugin_b
-         * @return int
-         */
-        public function _order_callback( $plugin_a, $plugin_b ) {
-                global $orderby, $order;
-
-                $a = $plugin_a[$orderby];
-                $b = $plugin_b[$orderby];
-
-                if ( $a == $b )
-                        return 0;
-
-                if ( 'DESC' === $order ) {
-                        return strcasecmp( $b, $a );
-                } else {
-                        return strcasecmp( $a, $b );
-                }
-        }
-
-        /**
-         *
-         * @global array $plugins
-         */
-        public function no_items() {
-                global $plugins;
-
-                if ( ! empty( $_REQUEST['s'] ) ) {
-                        $s = esc_html( wp_unslash( $_REQUEST['s'] ) );
-
-                        printf( __( 'No plugins found for &#8220;%s&#8221;.' ), $s );
-
-                        // We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link.
-                        if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
-                                echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
-                        }
-                } elseif ( ! empty( $plugins['all'] ) )
-                        _e( 'No plugins found.' );
-                else
-                        _e( 'You do not appear to have any plugins available at this time.' );
-        }
-
-        /**
-         * Displays the search box.
-         *
-         * @since 4.6.0
-         * @access public
-         *
-         * @param string $text     The 'submit' button label.
-         * @param string $input_id ID attribute value for the search input field.
-         */
-        public function search_box( $text, $input_id ) {
-                if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-                        return;
-                }
-
-                $input_id = $input_id . '-search-input';
-
-                if ( ! empty( $_REQUEST['orderby'] ) ) {
-                        echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-                }
-                if ( ! empty( $_REQUEST['order'] ) ) {
-                        echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-                }
-                ?>
-                <p class="search-box">
-                        <label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>"><?php echo $text; ?>:</label>
-                        <input type="search" id="<?php echo esc_attr( $input_id ); ?>" class="wp-filter-search" name="s" value="<?php _admin_search_query(); ?>" placeholder="<?php esc_attr_e( 'Search installed plugins...' ); ?>"/>
-                        <?php submit_button( $text, 'hide-if-js', '', false, array( 'id' => 'search-submit' ) ); ?>
-                </p>
-                <?php
-        }
-
-        /**
-         *
-         * @global string $status
-         * @return array
-         */
-        public function get_columns() {
-                global $status;
-
-                return array(
-                        'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
-                        'name'        => __( 'Plugin' ),
-                        'description' => __( 'Description' ),
-                );
-        }
-
-        /**
-         * @return array
-         */
-        protected function get_sortable_columns() {
-                return array();
-        }
-
-        /**
-         *
-         * @global array $totals
-         * @global string $status
-         * @return array
-         */
-        protected function get_views() {
-                global $totals, $status;
-
-                $status_links = array();
-                foreach ( $totals as $type => $count ) {
-                        if ( !$count )
-                                continue;
-
-                        switch ( $type ) {
-                                case 'all':
-                                        $text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
-                                        break;
-                                case 'active':
-                                        $text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'recently_activated':
-                                        $text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'inactive':
-                                        $text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'mustuse':
-                                        $text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'dropins':
-                                        $text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
-                                        break;
-                                case 'upgrade':
-                                        $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
-                                        break;
-                        }
-
-                        if ( 'search' !== $type ) {
-                                $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-                                        add_query_arg('plugin_status', $type, 'plugins.php'),
-                                        ( $type === $status ) ? ' class="current"' : '',
-                                        sprintf( $text, number_format_i18n( $count ) )
-                                        );
-                        }
-                }
-
-                return $status_links;
-        }
-
-        /**
-         *
-         * @global string $status
-         * @return array
-         */
-        protected function get_bulk_actions() {
-                global $status;
-
-                $actions = array();
-
-                if ( 'active' != $status )
-                        $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
-
-                if ( 'inactive' != $status && 'recent' != $status )
-                        $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
-
-                if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-                        if ( current_user_can( 'update_plugins' ) )
-                                $actions['update-selected'] = __( 'Update' );
-                        if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-                                $actions['delete-selected'] = __( 'Delete' );
-                }
-
-                return $actions;
-        }
-
-        /**
-         * @global string $status
-         * @param string $which
-         */
-        public function bulk_actions( $which = '' ) {
-                global $status;
-
-                if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-                        return;
-
-                parent::bulk_actions( $which );
-        }
-
-        /**
-         * @global string $status
-         * @param string $which
-         */
-        protected function extra_tablenav( $which ) {
-                global $status;
-
-                if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-                        return;
-
-                echo '<div class="alignleft actions">';
-
-                if ( 'recently_activated' == $status ) {
-                        submit_button( __( 'Clear List' ), '', 'clear-recent-list', false );
-                } elseif ( 'top' === $which && 'mustuse' === $status ) {
-                        /* translators: %s: mu-plugins directory name */
-                        echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
-                                '<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
-                        ) . '</p>';
-                } elseif ( 'top' === $which && 'dropins' === $status ) {
-                        /* translators: %s: wp-content directory name */
-                        echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
-                                '<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
-                        ) . '</p>';
-                }
-                echo '</div>';
-        }
-
-        /**
-         * @return string
-         */
-        public function current_action() {
-                if ( isset($_POST['clear-recent-list']) )
-                        return 'clear-recent-list';
-
-                return parent::current_action();
-        }
-
-        /**
-         *
-         * @global string $status
-         */
-        public function display_rows() {
-                global $status;
-
-                if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-                        return;
-
-                foreach ( $this->items as $plugin_file => $plugin_data )
-                        $this->single_row( array( $plugin_file, $plugin_data ) );
-        }
-
-        /**
-         * @global string $status
-         * @global int $page
-         * @global string $s
-         * @global array $totals