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
-         *
-         * @param array $item
-         */
-        public function single_row( $item ) {
-                global $status, $page, $s, $totals;
-
-                list( $plugin_file, $plugin_data ) = $item;
-                $context = $status;
-                $screen = $this->screen;
-
-                // Pre-order.
-                $actions = array(
-                        'deactivate' => '',
-                        'activate' => '',
-                        'details' => '',
-                        'edit' => '',
-                        'delete' => '',
-                );
-
-                // Do not restrict by default
-                $restrict_network_active = false;
-                $restrict_network_only = false;
-
-                if ( 'mustuse' === $context ) {
-                        $is_active = true;
-                } elseif ( 'dropins' === $context ) {
-                        $dropins = _get_dropins();
-                        $plugin_name = $plugin_file;
-                        if ( $plugin_file != $plugin_data['Name'] )
-                                $plugin_name .= '<br/>' . $plugin_data['Name'];
-                        if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
-                                $is_active = true;
-                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-                        } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
-                                $is_active = true;
-                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-                        } else {
-                                $is_active = false;
-                                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
-                                        /* translators: 1: drop-in constant name, 2: wp-config.php */
-                                        sprintf( __( 'Requires %1$s in %2$s file.' ),
-                                                "<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
-                                                '<code>wp-config.php</code>'
-                                        ) . '</p>';
-                        }
-                        if ( $plugin_data['Description'] )
-                                $description .= '<p>' . $plugin_data['Description'] . '</p>';
-                } else {
-                        if ( $screen->in_admin( 'network' ) ) {
-                                $is_active = is_plugin_active_for_network( $plugin_file );
-                        } else {
-                                $is_active = is_plugin_active( $plugin_file );
-                                $restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
-                                $restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
-                        }
-
-                        if ( $screen->in_admin( 'network' ) ) {
-                                if ( $is_active ) {
-                                        if ( current_user_can( 'manage_network_plugins' ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
-                                                }
-                                } else {
-                                        if ( current_user_can( 'manage_network_plugins' ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
-                                        }
-                                        if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
-                                        }
-                                }
-                        } else {
-                                if ( $restrict_network_active ) {
-                                        $actions = array(
-                                                'network_active' => __( 'Network Active' ),
-                                        );
-                                } elseif ( $restrict_network_only ) {
-                                        $actions = array(
-                                                'network_only' => __( 'Network Only' ),
-                                        );
-                                } elseif ( $is_active ) {
-                                        /* translators: %s: plugin name */
-                                        $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
-                                } else {
-                                        /* translators: %s: plugin name */
-                                        $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
-
-                                        if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
-                                        }
-                                } // end if $is_active
-
-                         } // end if $screen->in_admin( 'network' )
-
-                        if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
-                                /* translators: %s: plugin name */
-                                $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
-                        }
-                } // end if $context
-
-                $actions = array_filter( $actions );
-
-                if ( $screen->in_admin( 'network' ) ) {
-
-                        /**
-                         * Filters the action links displayed for each plugin in the Network Admin Plugins list table.
-                         *
-                         * The default action links for the Network plugins list table include
-                         * 'Network Activate', 'Network Deactivate', 'Edit', and 'Delete'.
-                         *
-                         * @since 3.1.0
-                         *
-                         * @param array  $actions     An array of plugin action links.
-                         * @param string $plugin_file Path to the plugin file relative to the plugins directory.
-                         * @param array  $plugin_data An array of plugin data.
-                         * @param string $context     The plugin context. Defaults are 'All', 'Active',
-                         *                            'Inactive', 'Recently Activated', 'Upgrade',
-                         *                            'Must-Use', 'Drop-ins', 'Search'.
-                         */
-                        $actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
-
-                        /**
-                         * Filters the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
-                         *
-                         * The dynamic portion of the hook name, $plugin_file, refers to the path
-                         * to the plugin file, relative to the plugins directory.
-                         *
-                         * @since 3.1.0
-                         *
-                         * @param array  $actions     An array of plugin action links.
-                         * @param string $plugin_file Path to the plugin file relative to the plugins directory.
-                         * @param array  $plugin_data An array of plugin data.
-                         * @param string $context     The plugin context. Defaults are 'All', 'Active',
-                         *                            'Inactive', 'Recently Activated', 'Upgrade',
-                         *                            'Must-Use', 'Drop-ins', 'Search'.
-                         */
-                        $actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
-
-                } else {
-
-                        /**
-                         * Filters the action links displayed for each plugin in the Plugins list table.
-                         *
-                         * The default action links for the site plugins list table include
-                         * 'Activate', 'Deactivate', and 'Edit', for a network site, and
-                         * 'Activate', 'Deactivate', 'Edit', and 'Delete' for a single site.
-                         *
-                         * @since 2.5.0
-                         * @since 2.6.0 The `$context` parameter was added.
-                         *
-                         * @param array  $actions     An array of plugin action links.
-                         * @param string $plugin_file Path to the plugin file relative to the plugins directory.
-                         * @param array  $plugin_data An array of plugin data.
-                         * @param string $context     The plugin context. Defaults are 'All', 'Active',
-                         *                            'Inactive', 'Recently Activated', 'Upgrade',
-                         *                            'Must-Use', 'Drop-ins', 'Search'.
-                         */
-                        $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
-
-                        /**
-                         * Filters the list of action links displayed for a specific plugin in the Plugins list table.
-                         *
-                         * The dynamic portion of the hook name, $plugin_file, refers to the path
-                         * to the plugin file, relative to the plugins directory.
-                         *
-                         * @since 2.7.0
-                         *
-                         * @param array  $actions     An array of plugin action links.
-                         * @param string $plugin_file Path to the plugin file relative to the plugins directory.
-                         * @param array  $plugin_data An array of plugin data.
-                         * @param string $context     The plugin context. Defaults are 'All', 'Active',
-                         *                            'Inactive', 'Recently Activated', 'Upgrade',
-                         *                            'Must-Use', 'Drop-ins', 'Search'.
-                         */
-                        $actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
-
-                }
-
-                $class = $is_active ? 'active' : 'inactive';
-                $checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-                if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
-                        $checkbox = '';
-                } else {
-                        $checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-                                . "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
-                }
-                if ( 'dropins' != $context ) {
-                        $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
-                        $plugin_name = $plugin_data['Name'];
-                }
-
-                if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-                        $class .= ' update';
-
-                $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
-                printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
-                        esc_attr( $class ),
-                        esc_attr( $plugin_slug ),
-                        esc_attr( $plugin_file )
-                );
-
-                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'>$checkbox</th>";
-                                        break;
-                                case 'name':
-                                        echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
-                                        echo $this->row_actions( $actions, true );
-                                        echo "</td>";
-                                        break;
-                                case 'description':
-                                        $classes = 'column-description desc';
-
-                                        echo "<td class='$classes{$extra_classes}'>
-                                                <div class='plugin-description'>$description</div>
-                                                <div class='$class second plugin-version-author-uri'>";
-
-                                        $plugin_meta = array();
-                                        if ( !empty( $plugin_data['Version'] ) )
-                                                $plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-                                        if ( !empty( $plugin_data['Author'] ) ) {
-                                                $author = $plugin_data['Author'];
-                                                if ( !empty( $plugin_data['AuthorURI'] ) )
-                                                        $author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
-                                                $plugin_meta[] = sprintf( __( 'By %s' ), $author );
-                                        }
-
-                                        // Details link using API info, if available
-                                        if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-                                                $plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-                                                        esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-                                                                '&TB_iframe=true&width=600&height=550' ) ),
-                                                        esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
-                                                        esc_attr( $plugin_name ),
-                                                        __( 'View details' )
-                                                );
-                                        } elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-                                                $plugin_meta[] = sprintf( '<a href="%s">%s</a>',
-                                                        esc_url( $plugin_data['PluginURI'] ),
-                                                        __( 'Visit plugin site' )
-                                                );
-                                        }
-
-                                        /**
-                                         * Filters the array of row meta for each plugin in the Plugins list table.
-                                         *
-                                         * @since 2.8.0
-                                         *
-                                         * @param array  $plugin_meta An array of the plugin's metadata,
-                                         *                            including the version, author,
-                                         *                            author URI, and plugin URI.
-                                         * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
-                                         * @param array  $plugin_data An array of plugin data.
-                                         * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
-                                         *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                                         *                            'Drop-ins', 'Search'.
-                                         */
-                                        $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
-                                        echo implode( ' | ', $plugin_meta );
-
-                                        echo "</div></td>";
-                                        break;
-                                default:
-                                        $classes = "$column_name column-$column_name $class";
-
-                                        echo "<td class='$classes{$extra_classes}'>";
-
-                                        /**
-                                         * Fires inside each custom column of the Plugins list table.
-                                         *
-                                         * @since 3.1.0
-                                         *
-                                         * @param string $column_name Name of the column.
-                                         * @param string $plugin_file Path to the plugin file.
-                                         * @param array  $plugin_data An array of plugin data.
-                                         */
-                                        do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
-
-                                        echo "</td>";
-                        }
-                }
-
-                echo "</tr>";
-
-                /**
-                 * Fires after each row in the Plugins list table.
-                 *
-                 * @since 2.3.0
-                 *
-                 * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
-                 * @param array  $plugin_data An array of plugin data.
-                 * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
-                 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                 *                            'Drop-ins', 'Search'.
-                 */
-                do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
-
-                /**
-                 * Fires after each specific row in the Plugins list table.
-                 *
-                 * The dynamic portion of the hook name, `$plugin_file`, refers to the path
-                 * to the plugin file, relative to the plugins directory.
-                 *
-                 * @since 2.7.0
-                 *
-                 * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
-                 * @param array  $plugin_data An array of plugin data.
-                 * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
-                 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                 *                            'Drop-ins', 'Search'.
-                 */
-                do_action( "after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status );
-        }
-
-        /**
-         * Gets the name of the primary column for this specific list table.
-         *
-         * @since 4.3.0
-         * @access protected
-         *
-         * @return string Unalterable name for the primary column, in this case, 'name'.
-         */
-        protected function get_primary_column_name() {
-                return 'name';
-        }
+    /**
+     * 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');
+    }
+
+    public function prepare_items() {
+        $status = wp_assign_request_var('status');
+        $plugin = wp_assign_request_var('plugin');
+        $totals = wp_assign_request_var('totals');
+        $page = wp_assign_request_var('page');
+        $orderby = wp_assign_request_var('orderby');
+        $order = wp_assign_request_var('order');
+        $s = wp_assign_request_var('s');
+
+        /**
+         * 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
+     *
+     * @param array $item
+     */
+    public function single_row( $item ) {
+        global $status, $page, $s, $totals;
+
+        list( $plugin_file, $plugin_data ) = $item;
+        $context = $status;
+        $screen = $this->screen;
+
+        // Pre-order.
+        $actions = array(
+            'deactivate' => '',
+            'activate' => '',
+            'details' => '',
+            'edit' => '',
+            'delete' => '',
+        );
+
+        // Do not restrict by default
+        $restrict_network_active = false;
+        $restrict_network_only = false;
+
+        if ( 'mustuse' === $context ) {
+            $is_active = true;
+        } elseif ( 'dropins' === $context ) {
+            $dropins = _get_dropins();
+            $plugin_name = $plugin_file;
+            if ( $plugin_file != $plugin_data['Name'] )
+                $plugin_name .= '<br/>' . $plugin_data['Name'];
+            if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+                $is_active = true;
+                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+            } elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+                $is_active = true;
+                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+            } else {
+                $is_active = false;
+                $description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
+                    /* translators: 1: drop-in constant name, 2: wp-config.php */
+                    sprintf( __( 'Requires %1$s in %2$s file.' ),
+                        "<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
+                        '<code>wp-config.php</code>'
+                    ) . '</p>';
+            }
+            if ( $plugin_data['Description'] )
+                $description .= '<p>' . $plugin_data['Description'] . '</p>';
+        } else {
+            if ( $screen->in_admin( 'network' ) ) {
+                $is_active = is_plugin_active_for_network( $plugin_file );
+            } else {
+                $is_active = is_plugin_active( $plugin_file );
+                $restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
+                $restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+            }
+
+            if ( $screen->in_admin( 'network' ) ) {
+                if ( $is_active ) {
+                    if ( current_user_can( 'manage_network_plugins' ) ) {
+                        /* translators: %s: plugin name */
+                        $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+                        }
+                } else {
+                    if ( current_user_can( 'manage_network_plugins' ) ) {
+                        /* translators: %s: plugin name */
+                        $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+                    }
+                    if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+                        /* translators: %s: plugin name */
+                        $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+                    }
+                }
+            } else {
+                if ( $restrict_network_active ) {
+                    $actions = array(
+                        'network_active' => __( 'Network Active' ),
+                    );
+                } elseif ( $restrict_network_only ) {
+                    $actions = array(
+                        'network_only' => __( 'Network Only' ),
+                    );
+                } elseif ( $is_active ) {
+                    /* translators: %s: plugin name */
+                    $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+                } else {
+                    /* translators: %s: plugin name */
+                    $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
+
+                    if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+                        /* translators: %s: plugin name */
+                        $actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+                    }
+                } // end if $is_active
+
+             } // end if $screen->in_admin( 'network' )
+
+            if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+                /* translators: %s: plugin name */
+                $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+            }
+        } // end if $context
+
+        $actions = array_filter( $actions );
+
+        if ( $screen->in_admin( 'network' ) ) {
+
+            /**
+             * Filters the action links displayed for each plugin in the Network Admin Plugins list table.
+             *
+             * The default action links for the Network plugins list table include
+             * 'Network Activate', 'Network Deactivate', 'Edit', and 'Delete'.
+             *
+             * @since 3.1.0
+             *
+             * @param array  $actions     An array of plugin action links.
+             * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+             * @param array  $plugin_data An array of plugin data.
+             * @param string $context     The plugin context. Defaults are 'All', 'Active',
+             *                            'Inactive', 'Recently Activated', 'Upgrade',
+             *                            'Must-Use', 'Drop-ins', 'Search'.
+             */
+            $actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+
+            /**
+             * Filters the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
+             *
+             * The dynamic portion of the hook name, $plugin_file, refers to the path
+             * to the plugin file, relative to the plugins directory.
+             *
+             * @since 3.1.0
+             *
+             * @param array  $actions     An array of plugin action links.
+             * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+             * @param array  $plugin_data An array of plugin data.
+             * @param string $context     The plugin context. Defaults are 'All', 'Active',
+             *                            'Inactive', 'Recently Activated', 'Upgrade',
+             *                            'Must-Use', 'Drop-ins', 'Search'.
+             */
+            $actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+
+        } else {
+
+            /**
+             * Filters the action links displayed for each plugin in the Plugins list table.
+             *
+             * The default action links for the site plugins list table include
+             * 'Activate', 'Deactivate', and 'Edit', for a network site, and
+             * 'Activate', 'Deactivate', 'Edit', and 'Delete' for a single site.
+             *
+             * @since 2.5.0
+             * @since 2.6.0 The `$context` parameter was added.
+             *
+             * @param array  $actions     An array of plugin action links.
+             * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+             * @param array  $plugin_data An array of plugin data.
+             * @param string $context     The plugin context. Defaults are 'All', 'Active',
+             *                            'Inactive', 'Recently Activated', 'Upgrade',
+             *                            'Must-Use', 'Drop-ins', 'Search'.
+             */
+            $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+
+            /**
+             * Filters the list of action links displayed for a specific plugin in the Plugins list table.
+             *
+             * The dynamic portion of the hook name, $plugin_file, refers to the path
+             * to the plugin file, relative to the plugins directory.
+             *
+             * @since 2.7.0
+             *
+             * @param array  $actions     An array of plugin action links.
+             * @param string $plugin_file Path to the plugin file relative to the plugins directory.
+             * @param array  $plugin_data An array of plugin data.
+             * @param string $context     The plugin context. Defaults are 'All', 'Active',
+             *                            'Inactive', 'Recently Activated', 'Upgrade',
+             *                            'Must-Use', 'Drop-ins', 'Search'.
+             */
+            $actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+
+        }
+
+        $class = $is_active ? 'active' : 'inactive';
+        $checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
+        if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+            $checkbox = '';
+        } else {
+            $checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
+                . "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+        }
+        if ( 'dropins' != $context ) {
+            $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
+            $plugin_name = $plugin_data['Name'];
+        }
+
+        if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+            $class .= ' update';
+
+        $plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
+        printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
+            esc_attr( $class ),
+            esc_attr( $plugin_slug ),
+            esc_attr( $plugin_file )
+        );
+
+        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'>$checkbox</th>";
+                    break;
+                case 'name':
+                    echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
+                    echo $this->row_actions( $actions, true );
+                    echo "</td>";
+                    break;
+                case 'description':
+                    $classes = 'column-description desc';
+
+                    echo "<td class='$classes{$extra_classes}'>
+                        <div class='plugin-description'>$description</div>
+                        <div class='$class second plugin-version-author-uri'>";
+
+                    $plugin_meta = array();
+                    if ( !empty( $plugin_data['Version'] ) )
+                        $plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+                    if ( !empty( $plugin_data['Author'] ) ) {
+                        $author = $plugin_data['Author'];
+                        if ( !empty( $plugin_data['AuthorURI'] ) )
+                            $author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+                        $plugin_meta[] = sprintf( __( 'By %s' ), $author );
+                    }
+
+                    // Details link using API info, if available
+                    if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
+                        $plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+                            esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
+                                '&TB_iframe=true&width=600&height=550' ) ),
+                            esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
+                            esc_attr( $plugin_name ),
+                            __( 'View details' )
+                        );
+                    } elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
+                        $plugin_meta[] = sprintf( '<a href="%s">%s</a>',
+                            esc_url( $plugin_data['PluginURI'] ),
+                            __( 'Visit plugin site' )
+                        );
+                    }
+
+                    /**
+                     * Filters the array of row meta for each plugin in the Plugins list table.
+                     *
+                     * @since 2.8.0
+                     *
+                     * @param array  $plugin_meta An array of the plugin's metadata,
+                     *                            including the version, author,
+                     *                            author URI, and plugin URI.
+                     * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
+                     * @param array  $plugin_data An array of plugin data.
+                     * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
+                     *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
+                     *                            'Drop-ins', 'Search'.
+                     */
+                    $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
+                    echo implode( ' | ', $plugin_meta );
+
+                    echo "</div></td>";
+                    break;
+                default:
+                    $classes = "$column_name column-$column_name $class";
+
+                    echo "<td class='$classes{$extra_classes}'>";
+
+                    /**
+                     * Fires inside each custom column of the Plugins list table.
+                     *
+                     * @since 3.1.0
+                     *
+                     * @param string $column_name Name of the column.
+                     * @param string $plugin_file Path to the plugin file.
+                     * @param array  $plugin_data An array of plugin data.
+                     */
+                    do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+
+                    echo "</td>";
+            }
+        }
+
+        echo "</tr>";
+
+        /**
+         * Fires after each row in the Plugins list table.
+         *
+         * @since 2.3.0
+         *
+         * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
+         * @param array  $plugin_data An array of plugin data.
+         * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
+         *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
+         *                            'Drop-ins', 'Search'.
+         */
+        do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+
+        /**
+         * Fires after each specific row in the Plugins list table.
+         *
+         * The dynamic portion of the hook name, `$plugin_file`, refers to the path
+         * to the plugin file, relative to the plugins directory.
+         *
+         * @since 2.7.0
+         *
+         * @param string $plugin_file Path to the plugin file, relative to the plugins directory.
+         * @param array  $plugin_data An array of plugin data.
+         * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
+         *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
+         *                            'Drop-ins', 'Search'.
+         */
+        do_action( "after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status );
+    }
+
+    /**
+     * Gets the name of the primary column for this specific list table.
+     *
+     * @since 4.3.0
+     * @access protected
+     *
+     * @return string Unalterable name for the primary column, in this case, 'name'.
+     */
+    protected function get_primary_column_name() {
+        return 'name';
+    }
 }

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

@@ -17 +17 @@
  */
 class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
-        public $features = array();
-
-        /**
-         *
-         * @return bool
-         */
-        public function ajax_user_can() {
-                return current_user_can( 'install_themes' );
-        }
-
-        /**
-         *
-         * @global array  $tabs
-         * @global string $tab
-         * @global int    $paged
-         * @global string $type
-         * @global array  $theme_field_defaults
-         */
-        public function prepare_items() {
-                include( ABSPATH . 'wp-admin/includes/theme-install.php' );
-
-                global $tabs, $tab, $paged, $type, $theme_field_defaults;
-                wp_reset_vars( array( 'tab' ) );
-
-                $search_terms = array();
-                $search_string = '';
-                if ( ! empty( $_REQUEST['s'] ) ){
-                        $search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-                        $search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
-                }
-
-                if ( ! empty( $_REQUEST['features'] ) )
-                        $this->features = $_REQUEST['features'];
-
-                $paged = $this->get_pagenum();
-
-                $per_page = 36;
-
-                // These are the tabs which are shown on the page,
-                $tabs = array();
-                $tabs['dashboard'] = __( 'Search' );
-                if ( 'search' === $tab )
-                        $tabs['search'] = __( 'Search Results' );
-                $tabs['upload'] = __( 'Upload' );
-                $tabs['featured'] = _x( 'Featured', 'themes' );
-                //$tabs['popular']  = _x( 'Popular', 'themes' );
-                $tabs['new']      = _x( 'Latest', 'themes' );
-                $tabs['updated']  = _x( 'Recently Updated', 'themes' );
-
-                $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
-
-                /** This filter is documented in wp-admin/theme-install.php */
-                $tabs = apply_filters( 'install_themes_tabs', $tabs );
-
-                /**
-                 * Filters tabs not associated with a menu item on the Install Themes screen.
-                 *
-                 * @since 2.8.0
-                 *
-                 * @param array $nonmenu_tabs The tabs that don't have a menu item on
-                 *                            the Install Themes screen.
-                 */
-                $nonmenu_tabs = apply_filters( 'install_themes_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' => $theme_field_defaults );
-
-                switch ( $tab ) {
-                        case 'search':
-                                $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-                                switch ( $type ) {
-                                        case 'tag':
-                                                $args['tag'] = array_map( 'sanitize_key', $search_terms );
-                                                break;
-                                        case 'term':
-                                                $args['search'] = $search_string;
-                                                break;
-                                        case 'author':
-                                                $args['author'] = $search_string;
-                                                break;
-                                }
-
-                                if ( ! empty( $this->features ) ) {
-                                        $args['tag'] = $this->features;
-                                        $_REQUEST['s'] = implode( ',', $this->features );
-                                        $_REQUEST['type'] = 'tag';
-                                }
-
-                                add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
-                                break;
-
-                        case 'featured':
-                        // case 'popular':
-                        case 'new':
-                        case 'updated':
-                                $args['browse'] = $tab;
-                                break;
-
-                        default:
-                                $args = false;
-                                break;
-                }
-
-                /**
-                 * Filters API request arguments for each Install Themes screen tab.
-                 *
-                 * The dynamic portion of the hook name, `$tab`, refers to the theme install
-                 * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
-                 * 'new', and 'updated'.
-                 *
-                 * @since 3.7.0
-                 *
-                 * @param array $args An array of themes API arguments.
-                 */
-                $args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
-
-                if ( ! $args )
-                        return;
-
-                $api = themes_api( 'query_themes', $args );
-
-                if ( is_wp_error( $api ) )
-                        wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
-
-                $this->items = $api->themes;
-
-                $this->set_pagination_args( array(
-                        'total_items' => $api->info['results'],
-                        'per_page' => $args['per_page'],
-                        'infinite_scroll' => true,
-                ) );
-        }
-
-        /**
-         * @access public
-         */
-        public function no_items() {
-                _e( 'No themes match your request.' );
-        }
-
-        /**
-         *
-         * @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 ) ? ' class="current"' : '';
-                        $href = self_admin_url('theme-install.php?tab=' . $action);
-                        $display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
-                }
-
-                return $display_tabs;
-        }
-
-        /**
-         * @access public
-         */
-        public function display() {
-                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+    public $features = array();
+
+    /**
+     *
+     * @return bool
+     */
+    public function ajax_user_can() {
+        return current_user_can( 'install_themes' );
+    }
+
+    public function prepare_items() {
+        include( ABSPATH . 'wp-admin/includes/theme-install.php' );
+
+        $tab = wp_assign_request_var('tab');
+        $type = wp_assign_request_var('type');
+        $term = wp_assign_request_var('term');
+        $theme_field_defaults = wp_assign_request_var('theme_field_defaults');
+
+        $search_terms = array();
+        $search_string = '';
+        if ( ! empty( $_REQUEST['s'] ) ){
+            $search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
+            $search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+        }
+
+        if ( ! empty( $_REQUEST['features'] ) )
+            $this->features = $_REQUEST['features'];
+
+        $paged = $this->get_pagenum();
+
+        $per_page = 36;
+
+        // These are the tabs which are shown on the page,
+        $tabs = array();
+        $tabs['dashboard'] = __( 'Search' );
+        if ( 'search' === $tab )
+            $tabs['search']     = __( 'Search Results' );
+        $tabs['upload'] = __( 'Upload' );
+        $tabs['featured'] = _x( 'Featured', 'themes' );
+        //$tabs['popular']  = _x( 'Popular', 'themes' );
+        $tabs['new']      = _x( 'Latest', 'themes' );
+        $tabs['updated']  = _x( 'Recently Updated', 'themes' );
+
+        $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
+
+        /** This filter is documented in wp-admin/theme-install.php */
+        $tabs = apply_filters( 'install_themes_tabs', $tabs );
+
+        /**
+         * Filters tabs not associated with a menu item on the Install Themes screen.
+         *
+         * @since 2.8.0
+         *
+         * @param array $nonmenu_tabs The tabs that don't have a menu item on
+         *                            the Install Themes screen.
+         */
+        $nonmenu_tabs = apply_filters( 'install_themes_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' => $theme_field_defaults );
+
+        switch ( $tab ) {
+            case 'search':
+                $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
+                switch ( $type ) {
+                    case 'tag':
+                        $args['tag'] = array_map( 'sanitize_key', $search_terms );
+                        break;
+                    case 'term':
+                        $args['search'] = $search_string;
+                        break;
+                    case 'author':
+                        $args['author'] = $search_string;
+                        break;
+                }
+
+                if ( ! empty( $this->features ) ) {
+                    $args['tag'] = $this->features;
+                    $_REQUEST['s'] = implode( ',', $this->features );
+                    $_REQUEST['type'] = 'tag';
+                }
+
+                add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
+                break;
+
+            case 'featured':
+            // case 'popular':
+            case 'new':
+            case 'updated':
+                $args['browse'] = $tab;
+                break;
+
+            default:
+                $args = false;
+                break;
+        }
+
+        /**
+         * Filters API request arguments for each Install Themes screen tab.
+         *
+         * The dynamic portion of the hook name, `$tab`, refers to the theme install
+         * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
+         * 'new', and 'updated'.
+         *
+         * @since 3.7.0
+         *
+         * @param array $args An array of themes API arguments.
+         */
+        $args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
+
+        if ( ! $args )
+            return;
+
+        $api = themes_api( 'query_themes', $args );
+
+        if ( is_wp_error( $api ) )
+            wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+
+        $this->items = $api->themes;
+
+        $this->set_pagination_args( array(
+            'total_items' => $api->info['results'],
+            'per_page' => $args['per_page'],
+            'infinite_scroll' => true,
+        ) );
+    }
+
+    /**
+     * @access public
+     */
+    public function no_items() {
+        _e( 'No themes match your request.' );
+    }
+
+    /**
+     *
+     * @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 ) ? ' class="current"' : '';
+            $href = self_admin_url('theme-install.php?tab=' . $action);
+            $display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
+        }
+
+        return $display_tabs;
+    }
+
+    /**
+     * @access public
+     */
+    public function display() {
+        wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
-                <div class="tablenav top themes">
-                        <div class="alignleft actions">
-                                <?php
-                                /**
-                                 * Fires in the Install Themes list table header.
-                                 *
-                                 * @since 2.8.0
-                                 */
-                                do_action( 'install_themes_table_header' );
-                                ?>
-                        </div>
-                        <?php $this->pagination( 'top' ); ?>
-                        <br class="clear" />
-                </div>
-
-                <div id="availablethemes">
-                        <?php $this->display_rows_or_placeholder(); ?>
-                </div>
-
-                <?php
-                $this->tablenav( 'bottom' );
-        }
-
-        /**
-         * @access public
-         */
-        public function display_rows() {
-                $themes = $this->items;
-                foreach ( $themes as $theme ) {
-                                ?>
-                                <div class="available-theme installable-theme"><?php
-                                        $this->single_row( $theme );
-                                ?></div>
-                <?php } // end foreach $theme_names
-
-                $this->theme_installer();
-        }
-
-        /**
-         * Prints a theme from the WordPress.org API.
-         *
-         * @since 3.1.0
-         * @access public
-         *
-         * @global array $themes_allowedtags
-         *
-         * @param object $theme {
-         *     An object that contains theme data returned by the WordPress.org API.
-         *
-         *     @type string $name           Theme name, e.g. 'Twenty Seventeen'.
-         *     @type string $slug           Theme slug, e.g. 'twentyseventeen'.
-         *     @type string $version        Theme version, e.g. '1.1'.
-         *     @type string $author         Theme author username, e.g. 'melchoyce'.
-         *     @type string $preview_url    Preview URL, e.g. 'http://2017.wordpress.net/'.
-         *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
-         *     @type float  $rating         Rating score.
-         *     @type int    $num_ratings    The number of ratings.
-         *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
-         *     @type string $description    Theme description.
-         *     @type string $download_link  Theme ZIP download URL.
-         * }
-         */
-        public function single_row( $theme ) {
-                global $themes_allowedtags;
-
-                if ( empty( $theme ) )
-                        return;
-
-                $name   = wp_kses( $theme->name,   $themes_allowedtags );
-                $author = wp_kses( $theme->author, $themes_allowedtags );
-
-                $preview_title = sprintf( __('Preview &#8220;%s&#8221;'), $name );
-                $preview_url   = add_query_arg( array(
-                        'tab'   => 'theme-information',
-                        'theme' => $theme->slug,
-                ), self_admin_url( 'theme-install.php' ) );
-
-                $actions = array();
-
-                $install_url = add_query_arg( array(
-                        'action' => 'install-theme',
-                        'theme'  => $theme->slug,
-                ), self_admin_url( 'update.php' ) );
-
-                $update_url = add_query_arg( array(
-                        'action' => 'upgrade-theme',
-                        'theme'  => $theme->slug,
-                ), self_admin_url( 'update.php' ) );
-
-                $status = $this->_get_theme_status( $theme );
-
-                switch ( $status ) {
-                        case 'update_available':
-                                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
-                                break;
-                        case 'newer_installed':
-                        case 'latest_installed':
-                                $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
-                                break;
-                        case 'install':
-                        default:
-                                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
-                                break;
-                }
-
-                $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
-
-                /**
-                 * Filters the install action links for a theme in the Install Themes list table.
-                 *
-                 * @since 3.4.0
-                 *
-                 * @param array    $actions An array of theme action hyperlinks. Defaults are
-                 *                          links to Install Now, Preview, and Details.
-                 * @param WP_Theme $theme   Theme object.
-                 */
-                $actions = apply_filters( 'theme_install_actions', $actions, $theme );
-
-                ?>
-                <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
-                        <img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
-                </a>
-
-                <h3><?php echo $name; ?></h3>
-                <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
-
-                <div class="action-links">
-                        <ul>
-                                <?php foreach ( $actions as $action ): ?>
-                                        <li><?php echo $action; ?></li>
-                                <?php endforeach; ?>
-                                <li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
-                        </ul>
-                </div>
-
-                <?php
-                $this->install_theme_info( $theme );
-        }
-
-        /**
-         * Prints the wrapper for the theme installer.
-         */
-        public function theme_installer() {
-                ?>
-                <div id="theme-installer" class="wp-full-overlay expanded">
-                        <div class="wp-full-overlay-sidebar">
-                                <div class="wp-full-overlay-header">
-                                        <a href="#" class="close-full-overlay button"><?php _e( 'Close' ); ?></a>
-                                        <span class="theme-install"></span>
-                                </div>
-                                <div class="wp-full-overlay-sidebar-content">
-                                        <div class="install-theme-info"></div>
-                                </div>
-                                <div class="wp-full-overlay-footer">
-                                        <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
-                                                <span class="collapse-sidebar-arrow"></span>
-                                                <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
-                                        </button>
-                                </div>
-                        </div>
-                        <div class="wp-full-overlay-main"></div>
-                </div>
-                <?php
-        }
-
-        /**
-         * Prints the wrapper for the theme installer with a provided theme's data.
-         * Used to make the theme installer work for no-js.
-         *
-         * @param object $theme - A WordPress.org Theme API object.
-         */
-        public function theme_installer_single( $theme ) {
-                ?>
-                <div id="theme-installer" class="wp-full-overlay single-theme">
-                        <div class="wp-full-overlay-sidebar">
-                                <?php $this->install_theme_info( $theme ); ?>
-                        </div>
-                        <div class="wp-full-overlay-main">
-                                <iframe src="<?php echo esc_url( $theme->preview_url ); ?>"></iframe>
-                        </div>
-                </div>
-                <?php
-        }
-
-        /**
-         * Prints the info for a theme (to be used in the theme installer modal).
-         *
-         * @global array $themes_allowedtags
-         *
-         * @param object $theme - A WordPress.org Theme API object.
-         */
-        public function install_theme_info( $theme ) {
-                global $themes_allowedtags;
-
-                if ( empty( $theme ) )
-                        return;
-
-                $name   = wp_kses( $theme->name,   $themes_allowedtags );
-                $author = wp_kses( $theme->author, $themes_allowedtags );
-
-                $install_url = add_query_arg( array(
-                        'action' => 'install-theme',
-                        'theme'  => $theme->slug,
-                ), self_admin_url( 'update.php' ) );
-
-                $update_url = add_query_arg( array(
-                        'action' => 'upgrade-theme',
-                        'theme'  => $theme->slug,
-                ), self_admin_url( 'update.php' ) );
-
-                $status = $this->_get_theme_status( $theme );
-
-                ?>
-                <div class="install-theme-info"><?php
-                        switch ( $status ) {
-                                case 'update_available':
-                                        echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
-                                        break;
-                                case 'newer_installed':
-                                case 'latest_installed':
-                                        echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
-                                        break;
-                                case 'install':
-                                default:
-                                        echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
-                                        break;
-                        } ?>
-                        <h3 class="theme-name"><?php echo $name; ?></h3>
-                        <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
-                        <?php if ( isset( $theme->screenshot_url ) ): ?>
-                                <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
-                        <?php endif; ?>
-                        <div class="theme-details">
-                                <?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
-                                <div class="theme-version">
-                                        <strong><?php _e('Version:') ?> </strong>
-                                        <?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
-                                </div>
-                                <div class="theme-description">
-                                        <?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
-                                </div>
-                        </div>
-                        <input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
-                </div>
-                <?php
-        }
-
-        /**
-         * Send required variables to JavaScript land
-         *
-         * @since 3.4.0
-         * @access public
-         *
-         * @global string $tab  Current tab within Themes->Install screen
-         * @global string $type Type of search.
-         *
-         * @param array $extra_args Unused.
-         */
-        public function _js_vars( $extra_args = array() ) {
-                global $tab, $type;
-                parent::_js_vars( compact( 'tab', 'type' ) );
-        }
-
-        /**
-         * Check to see if the theme is already installed.
-         *
-         * @since 3.4.0
-         * @access private
-         *
-         * @param object $theme - A WordPress.org Theme API object.
-         * @return string Theme status.
-         */
-        private function _get_theme_status( $theme ) {
-                $status = 'install';
-
-                $installed_theme = wp_get_theme( $theme->slug );
-                if ( $installed_theme->exists() ) {
-                        if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
-                                $status = 'latest_installed';
-                        elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
-                                $status = 'newer_installed';
-                        else
-                                $status = 'update_available';
-                }
-
-                return $status;
-        }
+        <div class="tablenav top themes">
+            <div class="alignleft actions">
+                <?php
+                /**
+                 * Fires in the Install Themes list table header.
+                 *
+                 * @since 2.8.0
+                 */
+                do_action( 'install_themes_table_header' );
+                ?>
+            </div>
+            <?php $this->pagination( 'top' ); ?>
+            <br class="clear" />
+        </div>
+
+        <div id="availablethemes">
+            <?php $this->display_rows_or_placeholder(); ?>
+        </div>
+
+        <?php
+        $this->tablenav( 'bottom' );
+    }
+
+    /**
+     * @access public
+     */
+    public function display_rows() {
+        $themes = $this->items;
+        foreach ( $themes as $theme ) {
+                ?>
+                <div class="available-theme installable-theme"><?php
+                    $this->single_row( $theme );
+                ?></div>
+        <?php } // end foreach $theme_names
+
+        $this->theme_installer();
+    }
+
+    /**
+     * Prints a theme from the WordPress.org API.
+     *
+     * @since 3.1.0
+     * @access public
+     *
+     * @global array $themes_allowedtags
+     *
+     * @param object $theme {
+     *     An object that contains theme data returned by the WordPress.org API.
+     *
+     *     @type string $name           Theme name, e.g. 'Twenty Seventeen'.
+     *     @type string $slug           Theme slug, e.g. 'twentyseventeen'.
+     *     @type string $version        Theme version, e.g. '1.1'.
+     *     @type string $author         Theme author username, e.g. 'melchoyce'.
+     *     @type string $preview_url    Preview URL, e.g. 'http://2017.wordpress.net/'.
+     *     @type string $screenshot_url Screenshot URL, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+     *     @type float  $rating         Rating score.
+     *     @type int    $num_ratings    The number of ratings.
+     *     @type string $homepage       Theme homepage, e.g. 'https://wordpress.org/themes/twentyseventeen/'.
+     *     @type string $description    Theme description.
+     *     @type string $download_link  Theme ZIP download URL.
+     * }
+     */
+    public function single_row( $theme ) {
+        global $themes_allowedtags;
+
+        if ( empty( $theme ) )
+            return;
+
+        $name   = wp_kses( $theme->name,   $themes_allowedtags );
+        $author = wp_kses( $theme->author, $themes_allowedtags );
+
+        $preview_title = sprintf( __('Preview &#8220;%s&#8221;'), $name );
+        $preview_url   = add_query_arg( array(
+            'tab'   => 'theme-information',
+            'theme' => $theme->slug,
+        ), self_admin_url( 'theme-install.php' ) );
+
+        $actions = array();
+
+        $install_url = add_query_arg( array(
+            'action' => 'install-theme',
+            'theme'  => $theme->slug,
+        ), self_admin_url( 'update.php' ) );
+
+        $update_url = add_query_arg( array(
+            'action' => 'upgrade-theme',
+            'theme'  => $theme->slug,
+        ), self_admin_url( 'update.php' ) );
+
+        $status = $this->_get_theme_status( $theme );
+
+        switch ( $status ) {
+            case 'update_available':
+                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+                break;
+            case 'newer_installed':
+            case 'latest_installed':
+                $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+                break;
+            case 'install':
+            default:
+                $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+                break;
+        }
+
+        $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
+
+        /**
+         * Filters the install action links for a theme in the Install Themes list table.
+         *
+         * @since 3.4.0
+         *
+         * @param array    $actions An array of theme action hyperlinks. Defaults are
+         *                          links to Install Now, Preview, and Details.
+         * @param WP_Theme $theme   Theme object.
+         */
+        $actions = apply_filters( 'theme_install_actions', $actions, $theme );
+
+        ?>
+        <a class="screenshot install-theme-preview" href="<?php echo esc_url( $preview_url ); ?>" title="<?php echo esc_attr( $preview_title ); ?>">
+            <img src="<?php echo esc_url( $theme->screenshot_url ); ?>" width="150" alt="" />
+        </a>
+
+        <h3><?php echo $name; ?></h3>
+        <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+
+        <div class="action-links">
+            <ul>
+                <?php foreach ( $actions as $action ): ?>
+                    <li><?php echo $action; ?></li>
+                <?php endforeach; ?>
+                <li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
+            </ul>
+        </div>
+
+        <?php
+        $this->install_theme_info( $theme );
+    }
+
+    /**
+     * Prints the wrapper for the theme installer.
+     */
+    public function theme_installer() {
+        ?>
+        <div id="theme-installer" class="wp-full-overlay expanded">
+            <div class="wp-full-overlay-sidebar">
+                <div class="wp-full-overlay-header">
+                    <a href="#" class="close-full-overlay button"><?php _e( 'Close' ); ?></a>
+                    <span class="theme-install"></span>
+                </div>
+                <div class="wp-full-overlay-sidebar-content">
+                    <div class="install-theme-info"></div>
+                </div>
+                <div class="wp-full-overlay-footer">
+                    <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+                        <span class="collapse-sidebar-arrow"></span>
+                        <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                    </button>
+                </div>
+            </div>
+            <div class="wp-full-overlay-main"></div>
+        </div>
+        <?php
+    }
+
+    /**
+     * Prints the wrapper for the theme installer with a provided theme's data.
+     * Used to make the theme installer work for no-js.
+     *
+     * @param object $theme - A WordPress.org Theme API object.
+     */
+    public function theme_installer_single( $theme ) {
+        ?>
+        <div id="theme-installer" class="wp-full-overlay single-theme">
+            <div class="wp-full-overlay-sidebar">
+                <?php $this->install_theme_info( $theme ); ?>
+            </div>
+            <div class="wp-full-overlay-main">
+                <iframe src="<?php echo esc_url( $theme->preview_url ); ?>"></iframe>
+            </div>
+        </div>
+        <?php
+    }
+
+    /**
+     * Prints the info for a theme (to be used in the theme installer modal).
+     *
+     * @global array $themes_allowedtags
+     *
+     * @param object $theme - A WordPress.org Theme API object.
+     */
+    public function install_theme_info( $theme ) {
+        global $themes_allowedtags;
+
+        if ( empty( $theme ) )
+            return;
+
+        $name   = wp_kses( $theme->name,   $themes_allowedtags );
+        $author = wp_kses( $theme->author, $themes_allowedtags );
+
+        $install_url = add_query_arg( array(
+            'action' => 'install-theme',
+            'theme'  => $theme->slug,
+        ), self_admin_url( 'update.php' ) );
+
+        $update_url = add_query_arg( array(
+            'action' => 'upgrade-theme',
+            'theme'  => $theme->slug,
+        ), self_admin_url( 'update.php' ) );
+
+        $status = $this->_get_theme_status( $theme );
+
+        ?>
+        <div class="install-theme-info"><?php
+            switch ( $status ) {
+                case 'update_available':
+                    echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+                    break;
+                case 'newer_installed':
+                case 'latest_installed':
+                    echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+                    break;
+                case 'install':
+                default:
+                    echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+                    break;
+            } ?>
+            <h3 class="theme-name"><?php echo $name; ?></h3>
+            <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
+            <?php if ( isset( $theme->screenshot_url ) ): ?>
+                <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
+            <?php endif; ?>
+            <div class="theme-details">
+                <?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
+                <div class="theme-version">
+                    <strong><?php _e('Version:') ?> </strong>
+                    <?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
+                </div>
+                <div class="theme-description">
+                    <?php echo wp_kses( $theme->description, $themes_allowedtags ); ?>
+                </div>
+            </div>
+            <input class="theme-preview-url" type="hidden" value="<?php echo esc_url( $theme->preview_url ); ?>" />
+        </div>
+        <?php
+    }
+
+    /**
+     * Send required variables to JavaScript land
+     *
+     * @since 3.4.0
+     * @access public
+     *
+     * @global string $tab  Current tab within Themes->Install screen
+     * @global string $type Type of search.
+     *
+     * @param array $extra_args Unused.
+     */
+    public function _js_vars( $extra_args = array() ) {
+        global $tab, $type;
+        parent::_js_vars( compact( 'tab', 'type' ) );
+    }
+
+    /**
+     * Check to see if the theme is already installed.
+     *
+     * @since 3.4.0
+     * @access private
+     *
+     * @param object $theme - A WordPress.org Theme API object.
+     * @return string Theme status.
+     */
+    private function _get_theme_status( $theme ) {
+        $status = 'install';
+
+        $installed_theme = wp_get_theme( $theme->slug );
+        if ( $installed_theme->exists() ) {
+            if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
+                $status = 'latest_installed';
+            elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
+                $status = 'newer_installed';
+            else
+                $status = 'update_available';
+        }
+
+        return $status;
+    }
 }

src/wp-admin/includes/misc.php

@@ -14 +14 @@
  * @return bool
  */
 function got_mod_rewrite() {
-        $got_rewrite = apache_mod_loaded('mod_rewrite', true);
-
-        /**
-         * Filters whether Apache and mod_rewrite are present.
-         *
-         * This filter was previously used to force URL rewriting for other servers,
-         * like nginx. Use the {@see 'got_url_rewrite'} filter in got_url_rewrite() instead.
-         *
-         * @since 2.5.0
-         *
-         * @see got_url_rewrite()
-         *
-         * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
-         */
-        return apply_filters( 'got_rewrite', $got_rewrite );
+    $got_rewrite = apache_mod_loaded('mod_rewrite', true);
+
+    /**
+     * Filters whether Apache and mod_rewrite are present.
+     *
+     * This filter was previously used to force URL rewriting for other servers,
+     * like nginx. Use the {@see 'got_url_rewrite'} filter in got_url_rewrite() instead.
+     *
+     * @since 2.5.0
+     *
+     * @see got_url_rewrite()
+     *
+     * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
+     */
+    return apply_filters( 'got_rewrite', $got_rewrite );
 }
 
 /**
@@ -43 +43 @@
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-        $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
-
-        /**
-         * Filters whether URL rewriting is available.
-         *
-         * @since 3.7.0
-         *
-         * @param bool $got_url_rewrite Whether URL rewriting is available.
-         */
-        return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+    $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+
+    /**
+     * Filters whether URL rewriting is available.
+     *
+     * @since 3.7.0
+     *
+     * @param bool $got_url_rewrite Whether URL rewriting is available.
+     */
+    return apply_filters( 'got_url_rewrite', $got_url_rewrite );
 }
 
 /**
@@ -65 +65 @@
  * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
  */
 function extract_from_markers( $filename, $marker ) {
-        $result = array ();
-
-        if (!file_exists( $filename ) ) {
-                return $result;
-        }
-
-        if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
-        {
-                $state = false;
-                foreach ( $markerdata as $markerline ) {
-                        if (strpos($markerline, '# END ' . $marker) !== false)
-                                $state = false;
-                        if ( $state )
-                                $result[] = $markerline;
-                        if (strpos($markerline, '# BEGIN ' . $marker) !== false)
-                                $state = true;
-                }
-        }
-
-        return $result;
+    $result = array ();
+
+    if (!file_exists( $filename ) ) {
+        return $result;
+    }
+
+    if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
+    {
+        $state = false;
+        foreach ( $markerdata as $markerline ) {
+            if (strpos($markerline, '# END ' . $marker) !== false)
+                $state = false;
+            if ( $state )
+                $result[] = $markerline;
+            if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+                $state = true;
+        }
+    }
+
+    return $result;
 }
 
 /**
@@ -102 +102 @@
  * @return bool True on write success, false on failure.
  */
 function insert_with_markers( $filename, $marker, $insertion ) {
-        if ( ! file_exists( $filename ) ) {
-                if ( ! is_writable( dirname( $filename ) ) ) {
-                        return false;
-                }
-                if ( ! touch( $filename ) ) {
-                        return false;
-                }
-        } elseif ( ! is_writeable( $filename ) ) {
-                return false;
-        }
-
-        if ( ! is_array( $insertion ) ) {
-                $insertion = explode( "\n", $insertion );
-        }
-
-        $start_marker = "# BEGIN {$marker}";
-        $end_marker   = "# END {$marker}";
-
-        $fp = fopen( $filename, 'r+' );
-        if ( ! $fp ) {
-                return false;
-        }
-
-        // Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
-        flock( $fp, LOCK_EX );
-
-        $lines = array();
-        while ( ! feof( $fp ) ) {
-                $lines[] = rtrim( fgets( $fp ), "\r\n" );
-        }
-
-        // Split out the existing file into the preceding lines, and those that appear after the marker
-        $pre_lines = $post_lines = $existing_lines = array();
-        $found_marker = $found_end_marker = false;
-        foreach ( $lines as $line ) {
-                if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
-                        $found_marker = true;
-                        continue;
-                } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
-                        $found_end_marker = true;
-                        continue;
-                }
-                if ( ! $found_marker ) {
-                        $pre_lines[] = $line;
-                } elseif ( $found_marker && $found_end_marker ) {
-                        $post_lines[] = $line;
-                } else {
-                        $existing_lines[] = $line;
-                }
-        }
-
-        // Check to see if there was a change
-        if ( $existing_lines === $insertion ) {
-                flock( $fp, LOCK_UN );
-                fclose( $fp );
-
-                return true;
-        }
-
-        // Generate the new file data
-        $new_file_data = implode( "\n", array_merge(
-                $pre_lines,
-                array( $start_marker ),
-                $insertion,
-                array( $end_marker ),
-                $post_lines
-        ) );
-
-        // Write to the start of the file, and truncate it to that length
-        fseek( $fp, 0 );
-        $bytes = fwrite( $fp, $new_file_data );
-        if ( $bytes ) {
-                ftruncate( $fp, ftell( $fp ) );
-        }
-        fflush( $fp );
-        flock( $fp, LOCK_UN );
-        fclose( $fp );
-
-        return (bool) $bytes;
+    if ( ! file_exists( $filename ) ) {
+        if ( ! is_writable( dirname( $filename ) ) ) {
+            return false;
+        }
+        if ( ! touch( $filename ) ) {
+            return false;
+        }
+    } elseif ( ! is_writeable( $filename ) ) {
+        return false;
+    }
+
+    if ( ! is_array( $insertion ) ) {
+        $insertion = explode( "\n", $insertion );
+    }
+
+    $start_marker = "# BEGIN {$marker}";
+    $end_marker   = "# END {$marker}";
+
+    $fp = fopen( $filename, 'r+' );
+    if ( ! $fp ) {
+        return false;
+    }
+
+    // Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
+    flock( $fp, LOCK_EX );
+
+    $lines = array();
+    while ( ! feof( $fp ) ) {
+        $lines[] = rtrim( fgets( $fp ), "\r\n" );
+    }
+
+    // Split out the existing file into the preceding lines, and those that appear after the marker
+    $pre_lines = $post_lines = $existing_lines = array();
+    $found_marker = $found_end_marker = false;
+    foreach ( $lines as $line ) {
+        if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+            $found_marker = true;
+            continue;
+        } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+            $found_end_marker = true;
+            continue;
+        }
+        if ( ! $found_marker ) {
+            $pre_lines[] = $line;
+        } elseif ( $found_marker && $found_end_marker ) {
+            $post_lines[] = $line;
+        } else {
+            $existing_lines[] = $line;
+        }
+    }
+
+    // Check to see if there was a change
+    if ( $existing_lines === $insertion ) {
+        flock( $fp, LOCK_UN );
+        fclose( $fp );
+
+        return true;
+    }
+
+    // Generate the new file data
+    $new_file_data = implode( "\n", array_merge(
+        $pre_lines,
+        array( $start_marker ),
+        $insertion,
+        array( $end_marker ),
+        $post_lines
+    ) );
+
+    // Write to the start of the file, and truncate it to that length
+    fseek( $fp, 0 );
+    $bytes = fwrite( $fp, $new_file_data );
+    if ( $bytes ) {
+        ftruncate( $fp, ftell( $fp ) );
+    }
+    fflush( $fp );
+    flock( $fp, LOCK_UN );
+    fclose( $fp );
+
+    return (bool) $bytes;
 }
 
 /**
@@ -194 +194 @@
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-        if ( is_multisite() )
-                return;
-
-        global $wp_rewrite;
-
-        $home_path = get_home_path();
-        $htaccess_file = $home_path.'.htaccess';
-
-        /*
-         * If the file doesn't already exist check for write access to the directory
-         * and whether we have some rules. Else check for write access to the file.
-         */
-        if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
-                if ( got_mod_rewrite() ) {
-                        $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
-                        return insert_with_markers( $htaccess_file, 'WordPress', $rules );
-                }
-        }
-
-        return false;
+    if ( is_multisite() )
+        return;
+
+    global $wp_rewrite;
+
+    $home_path = get_home_path();
+    $htaccess_file = $home_path.'.htaccess';
+
+    /*
+     * If the file doesn't already exist check for write access to the directory
+     * and whether we have some rules. Else check for write access to the file.
+     */
+    if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
+        if ( got_mod_rewrite() ) {
+            $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
+            return insert_with_markers( $htaccess_file, 'WordPress', $rules );
+        }
+    }
+
+    return false;
 }
 
 /**
@@ -227 +227 @@
  * @return bool True if web.config was updated successfully
  */
 function iis7_save_url_rewrite_rules(){
-        if ( is_multisite() )
-                return;
-
-        global $wp_rewrite;
-
-        $home_path = get_home_path();
-        $web_config_file = $home_path . 'web.config';
-
-        // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
-        if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
-                $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
-                if ( ! empty($rule) ) {
-                        return iis7_add_rewrite_rule($web_config_file, $rule);
-                } else {
-                        return iis7_delete_rewrite_rule($web_config_file);
-                }
-        }
-        return false;
+    if ( is_multisite() )
+        return;
+
+    global $wp_rewrite;
+
+    $home_path = get_home_path();
+    $web_config_file = $home_path . 'web.config';
+
+    // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
+    if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
+        $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
+        if ( ! empty($rule) ) {
+            return iis7_add_rewrite_rule($web_config_file, $rule);
+        } else {
+            return iis7_delete_rewrite_rule($web_config_file);
+        }
+    }
+    return false;
 }
 
 /**
@@ -255 +255 @@
  * @param string $file
  */
 function update_recently_edited( $file ) {
-        $oldfiles = (array ) get_option( 'recently_edited' );
-        if ( $oldfiles ) {
-                $oldfiles = array_reverse( $oldfiles );
-                $oldfiles[] = $file;
-                $oldfiles = array_reverse( $oldfiles );
-                $oldfiles = array_unique( $oldfiles );
-                if ( 5 < count( $oldfiles ))
-                        array_pop( $oldfiles );
-        } else {
-                $oldfiles[] = $file;
-        }
-        update_option( 'recently_edited', $oldfiles );
+    $oldfiles = (array ) get_option( 'recently_edited' );
+    if ( $oldfiles ) {
+        $oldfiles = array_reverse( $oldfiles );
+        $oldfiles[] = $file;
+        $oldfiles = array_reverse( $oldfiles );
+        $oldfiles = array_unique( $oldfiles );
+        if ( 5 < count( $oldfiles ))
+            array_pop( $oldfiles );
+    } else {
+        $oldfiles[] = $file;
+    }
+    update_option( 'recently_edited', $oldfiles );
 }
 
 /**
@@ -278 +278 @@
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-        if ( wp_installing() )
-                return;
-
-        if ( is_multisite() && ms_is_switched() ) {
-                delete_option( 'rewrite_rules' );
-        } else {
-                flush_rewrite_rules();
-        }
+    if ( wp_installing() )
+        return;
+
+    if ( is_multisite() && ms_is_switched() ) {
+        delete_option( 'rewrite_rules' );
+    } else {
+        flush_rewrite_rules();
+    }
 }
 
 
@@ -301 +301 @@
  * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
-        foreach ( $vars as $var ) {
-                if ( empty( $_POST[ $var ] ) ) {
-                        if ( empty( $_GET[ $var ] ) ) {
-                                $GLOBALS[ $var ] = '';
-                        } else {
-                                $GLOBALS[ $var ] = $_GET[ $var ];
-                        }
-                } else {
-                        $GLOBALS[ $var ] = $_POST[ $var ];
-                }
-        }
+    foreach ( $vars as $var ) {
+        if ( empty( $_POST[ $var ] ) ) {
+            if ( empty( $_GET[ $var ] ) ) {
+                $GLOBALS[ $var ] = '';
+            } else {
+                $GLOBALS[ $var ] = $_GET[ $var ];
+            }
+        } else {
+            $GLOBALS[ $var ] = $_POST[ $var ];
+        }
+    }
+}
+
+/**
+ * Return $_POST[ $var ] or $_GET[ $var ] value.
+ *
+ * This functions returns $_POST[ $var ] or $_GET[ $var ] value in this order
+ *  if they are not empty, otherwise it returns an empty string.
+ *
+ * @since 4.8.0
+ *
+ * @param  string $var The key of the array for getting value to return.
+ *
+ * @return mixed $_POST[ $var ] or $_GET[ $var ] value or an empty string.
+ */
+function wp_assign_request_var( $var ) {
+    if ( empty( $_POST[ $var ] ) ) {
+        if ( empty( $_GET[ $var ] ) ) {
+            return '';
+        } else {
+            return $_GET[ $var ];
+        }
+    } else {
+        return $_POST[ $var ];
+    }
 }
 
 /**
@@ -322 +346 @@
  * @param string|WP_Error $message
  */
 function show_message($message) {
-        if ( is_wp_error($message) ){
-                if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
-                        $message = $message->get_error_message() . ': ' . $message->get_error_data();
-                else
-                        $message = $message->get_error_message();
-        }
-        echo "<p>$message</p>\n";
-        wp_ob_end_flush_all();
-        flush();
+    if ( is_wp_error($message) ){
+        if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
+            $message = $message->get_error_message() . ': ' . $message->get_error_data();
+        else
+            $message = $message->get_error_message();
+    }
+    echo "<p>$message</p>\n";
+    wp_ob_end_flush_all();
+    flush();
 }
 
 /**
@@ -340 +364 @@
  * @return array
  */
 function wp_doc_link_parse( $content ) {
-        if ( !is_string( $content ) || empty( $content ) )
-                return array();
-
-        if ( !function_exists('token_get_all') )
-                return array();
-
-        $tokens = token_get_all( $content );
-        $count = count( $tokens );
-        $functions = array();
-        $ignore_functions = array();
-        for ( $t = 0; $t < $count - 2; $t++ ) {
-                if ( ! is_array( $tokens[ $t ] ) ) {
-                        continue;
-                }
-
-                if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
-                        // If it's a function or class defined locally, there's not going to be any docs available
-                        if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
-                                $ignore_functions[] = $tokens[$t][1];
-                        }
-                        // Add this to our stack of unique references
-                        $functions[] = $tokens[$t][1];
-                }
-        }
-
-        $functions = array_unique( $functions );
-        sort( $functions );
-
-        /**
-         * Filters the list of functions and classes to be ignored from the documentation lookup.
-         *
-         * @since 2.8.0
-         *
-         * @param array $ignore_functions Functions and classes to be ignored.
-         */
-        $ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
-
-        $ignore_functions = array_unique( $ignore_functions );
-
-        $out = array();
-        foreach ( $functions as $function ) {
-                if ( in_array( $function, $ignore_functions ) )
-                        continue;
-                $out[] = $function;
-        }
-
-        return $out;
+    if ( !is_string( $content ) || empty( $content ) )
+        return array();
+
+    if ( !function_exists('token_get_all') )
+        return array();
+
+    $tokens = token_get_all( $content );
+    $count = count( $tokens );
+    $functions = array();
+    $ignore_functions = array();
+    for ( $t = 0; $t < $count - 2; $t++ ) {
+        if ( ! is_array( $tokens[ $t ] ) ) {
+            continue;
+        }
+
+        if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
+            // If it's a function or class defined locally, there's not going to be any docs available
+            if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
+                $ignore_functions[] = $tokens[$t][1];
+            }
+            // Add this to our stack of unique references
+            $functions[] = $tokens[$t][1];
+        }
+    }
+
+    $functions = array_unique( $functions );
+    sort( $functions );
+
+    /**
+     * Filters the list of functions and classes to be ignored from the documentation lookup.
+     *
+     * @since 2.8.0
+     *
+     * @param array $ignore_functions Functions and classes to be ignored.
+     */
+    $ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
+
+    $ignore_functions = array_unique( $ignore_functions );
+
+    $out = array();
+    foreach ( $functions as $function ) {
+        if ( in_array( $function, $ignore_functions ) )
+            continue;
+        $out[] = $function;
+    }
+
+    return $out;
 }
 
 /**
@@ -396 +420 @@
  */
 function set_screen_options() {
 
-        if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-                check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
-
-                if ( !$user = wp_get_current_user() )
-                        return;
-                $option = $_POST['wp_screen_options']['option'];
-                $value = $_POST['wp_screen_options']['value'];
-
-                if ( $option != sanitize_key( $option ) )
-                        return;
-
-                $map_option = $option;
-                $type = str_replace('edit_', '', $map_option);
-                $type = str_replace('_per_page', '', $type);
-                if ( in_array( $type, get_taxonomies() ) )
-                        $map_option = 'edit_tags_per_page';
-                elseif ( in_array( $type, get_post_types() ) )
-                        $map_option = 'edit_per_page';
-                else
-                        $option = str_replace('-', '_', $option);
-
-                switch ( $map_option ) {
-                        case 'edit_per_page':
-                        case 'users_per_page':
-                        case 'edit_comments_per_page':
-                        case 'upload_per_page':
-                        case 'edit_tags_per_page':
-                        case 'plugins_per_page':
-                        // Network admin
-                        case 'sites_network_per_page':
-                        case 'users_network_per_page':
-                        case 'site_users_network_per_page':
-                        case 'plugins_network_per_page':
-                        case 'themes_network_per_page':
-                        case 'site_themes_network_per_page':
-                                $value = (int) $value;
-                                if ( $value < 1 || $value > 999 )
-                                        return;
-                                break;
-                        default:
-
-                                /**
-                                 * Filters a screen option value before it is set.
-                                 *
-                                 * The filter can also be used to modify non-standard [items]_per_page
-                                 * settings. See the parent function for a full list of standard options.
-                                 *
-                                 * Returning false to the filter will skip saving the current option.
-                                 *
-                                 * @since 2.8.0
-                                 *
-                                 * @see set_screen_options()
-                                 *
-                                 * @param bool|int $value  Screen option value. Default false to skip.
-                                 * @param string   $option The option name.
-                                 * @param int      $value  The number of rows to use.
-                                 */
-                                $value = apply_filters( 'set-screen-option', false, $option, $value );
-
-                                if ( false === $value )
-                                        return;
-                                break;
-                }
-
-                update_user_meta($user->ID, $option, $value);
-
-                $url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
-                if ( isset( $_POST['mode'] ) ) {
-                        $url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
-                }
-
-                wp_safe_redirect( $url );
-                exit;
-        }
+    if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
+        check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+
+        if ( !$user = wp_get_current_user() )
+            return;
+        $option = $_POST['wp_screen_options']['option'];
+        $value = $_POST['wp_screen_options']['value'];
+
+        if ( $option != sanitize_key( $option ) )
+            return;
+
+        $map_option = $option;
+        $type = str_replace('edit_', '', $map_option);
+        $type = str_replace('_per_page', '', $type);
+        if ( in_array( $type, get_taxonomies() ) )
+            $map_option = 'edit_tags_per_page';
+        elseif ( in_array( $type, get_post_types() ) )
+            $map_option = 'edit_per_page';
+        else
+            $option = str_replace('-', '_', $option);
+
+        switch ( $map_option ) {
+            case 'edit_per_page':
+            case 'users_per_page':
+            case 'edit_comments_per_page':
+            case 'upload_per_page':
+            case 'edit_tags_per_page':
+            case 'plugins_per_page':
+            // Network admin
+            case 'sites_network_per_page':
+            case 'users_network_per_page':
+            case 'site_users_network_per_page':
+            case 'plugins_network_per_page':
+            case 'themes_network_per_page':
+            case 'site_themes_network_per_page':
+                $value = (int) $value;
+                if ( $value < 1 || $value > 999 )
+                    return;
+                break;
+            default:
+
+                /**
+                 * Filters a screen option value before it is set.
+                 *
+                 * The filter can also be used to modify non-standard [items]_per_page
+                 * settings. See the parent function for a full list of standard options.
+                 *
+                 * Returning false to the filter will skip saving the current option.
+                 *
+                 * @since 2.8.0
+                 *
+                 * @see set_screen_options()
+                 *
+                 * @param bool|int $value  Screen option value. Default false to skip.
+                 * @param string   $option The option name.
+                 * @param int      $value  The number of rows to use.
+                 */
+                $value = apply_filters( 'set-screen-option', false, $option, $value );
+
+                if ( false === $value )
+                    return;
+                break;
+        }
+
+        update_user_meta($user->ID, $option, $value);
+
+        $url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
+        if ( isset( $_POST['mode'] ) ) {
+            $url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+        }
+
+        wp_safe_redirect( $url );
+        exit;
+    }
 }
 
 /**
@@ -481 +505 @@
  * @param string $filename The file path to the configuration file
  */
 function iis7_rewrite_rule_exists($filename) {
-        if ( ! file_exists($filename) )
-                return false;
-        if ( ! class_exists( 'DOMDocument', false ) ) {
-                return false;
-        }
-
-        $doc = new DOMDocument();
-        if ( $doc->load($filename) === false )
-                return false;
-        $xpath = new DOMXPath($doc);
-        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
-        if ( $rules->length == 0 )
-                return false;
-        else
-                return true;
+    if ( ! file_exists($filename) )
+        return false;
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
+
+    $doc = new DOMDocument();
+    if ( $doc->load($filename) === false )
+        return false;
+    $xpath = new DOMXPath($doc);
+    $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
+    if ( $rules->length == 0 )
+        return false;
+    else
+        return true;
 }
 
 /**
@@ -507 +531 @@
  * @return bool
  */
 function iis7_delete_rewrite_rule($filename) {
-        // If configuration file does not exist then rules also do not exist so there is nothing to delete
-        if ( ! file_exists($filename) )
-                return true;
-
-        if ( ! class_exists( 'DOMDocument', false ) ) {
-                return false;
-        }
-
-        $doc = new DOMDocument();
-        $doc->preserveWhiteSpace = false;
-
-        if ( $doc -> load($filename) === false )
-                return false;
-        $xpath = new DOMXPath($doc);
-        $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
-        if ( $rules->length > 0 ) {
-                $child = $rules->item(0);
-                $parent = $child->parentNode;
-                $parent->removeChild($child);
-                $doc->formatOutput = true;
-                saveDomDocument($doc, $filename);
-        }
-        return true;
+    // If configuration file does not exist then rules also do not exist so there is nothing to delete
+    if ( ! file_exists($filename) )
+        return true;
+
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
+
+    $doc = new DOMDocument();
+    $doc->preserveWhiteSpace = false;
+
+    if ( $doc -> load($filename) === false )
+        return false;
+    $xpath = new DOMXPath($doc);
+    $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
+    if ( $rules->length > 0 ) {
+        $child = $rules->item(0);
+        $parent = $child->parentNode;
+        $parent->removeChild($child);
+        $doc->formatOutput = true;
+        saveDomDocument($doc, $filename);
+    }
+    return true;
 }
 
 /**
@@ -542 +566 @@
  * @return bool
  */
 function iis7_add_rewrite_rule($filename, $rewrite_rule) {
-        if ( ! class_exists( 'DOMDocument', false ) ) {
-                return false;
-        }
-
-        // If configuration file does not exist then we create one.
-        if ( ! file_exists($filename) ) {
-                $fp = fopen( $filename, 'w');
-                fwrite($fp, '<configuration/>');
-                fclose($fp);
-        }
-
-        $doc = new DOMDocument();
-        $doc->preserveWhiteSpace = false;
-
-        if ( $doc->load($filename) === false )
-                return false;
-
-        $xpath = new DOMXPath($doc);
-
-        // First check if the rule already exists as in that case there is no need to re-add it
-        $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
-        if ( $wordpress_rules->length > 0 )
-                return true;
-
-        // Check the XPath to the rewrite rule and create XML nodes if they do not exist
-        $xmlnodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
-        if ( $xmlnodes->length > 0 ) {
-                $rules_node = $xmlnodes->item(0);
-        } else {
-                $rules_node = $doc->createElement('rules');
-
-                $xmlnodes = $xpath->query('/configuration/system.webServer/rewrite');
-                if ( $xmlnodes->length > 0 ) {
-                        $rewrite_node = $xmlnodes->item(0);
-                        $rewrite_node->appendChild($rules_node);
-                } else {
-                        $rewrite_node = $doc->createElement('rewrite');
-                        $rewrite_node->appendChild($rules_node);
-
-                        $xmlnodes = $xpath->query('/configuration/system.webServer');
-                        if ( $xmlnodes->length > 0 ) {
-                                $system_webServer_node = $xmlnodes->item(0);
-                                $system_webServer_node->appendChild($rewrite_node);
-                        } else {
-                                $system_webServer_node = $doc->createElement('system.webServer');
-                                $system_webServer_node->appendChild($rewrite_node);
-
-                                $xmlnodes = $xpath->query('/configuration');
-                                if ( $xmlnodes->length > 0 ) {
-                                        $config_node = $xmlnodes->item(0);
-                                        $config_node->appendChild($system_webServer_node);
-                                } else {
-                                        $config_node = $doc->createElement('configuration');
-                                        $doc->appendChild($config_node);
-                                        $config_node->appendChild($system_webServer_node);
-                                }
-                        }
-                }
-        }
-
-        $rule_fragment = $doc->createDocumentFragment();
-        $rule_fragment->appendXML($rewrite_rule);
-        $rules_node->appendChild($rule_fragment);
-
-        $doc->encoding = "UTF-8";
-        $doc->formatOutput = true;
-        saveDomDocument($doc, $filename);
-
-        return true;
+    if ( ! class_exists( 'DOMDocument', false ) ) {
+        return false;
+    }
+
+    // If configuration file does not exist then we create one.
+    if ( ! file_exists($filename) ) {
+        $fp = fopen( $filename, 'w');
+        fwrite($fp, '<configuration/>');
+        fclose($fp);
+    }
+
+    $doc = new DOMDocument();
+    $doc->preserveWhiteSpace = false;
+
+    if ( $doc->load($filename) === false )
+        return false;
+
+    $xpath = new DOMXPath($doc);
+
+    // First check if the rule already exists as in that case there is no need to re-add it
+    $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
+    if ( $wordpress_rules->length > 0 )
+        return true;
+
+    // Check the XPath to the rewrite rule and create XML nodes if they do not exist
+    $xmlnodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
+    if ( $xmlnodes->length > 0 ) {
+        $rules_node = $xmlnodes->item(0);
+    } else {
+        $rules_node = $doc->createElement('rules');
+
+        $xmlnodes = $xpath->query('/configuration/system.webServer/rewrite');
+        if ( $xmlnodes->length > 0 ) {
+            $rewrite_node = $xmlnodes->item(0);
+            $rewrite_node->appendChild($rules_node);
+        } else {
+            $rewrite_node = $doc->createElement('rewrite');
+            $rewrite_node->appendChild($rules_node);
+
+            $xmlnodes = $xpath->query('/configuration/system.webServer');
+            if ( $xmlnodes->length > 0 ) {
+                $system_webServer_node = $xmlnodes->item(0);
+                $system_webServer_node->appendChild($rewrite_node);
+            } else {
+                $system_webServer_node = $doc->createElement('system.webServer');
+                $system_webServer_node->appendChild($rewrite_node);
+
+                $xmlnodes = $xpath->query('/configuration');
+                if ( $xmlnodes->length > 0 ) {
+                    $config_node = $xmlnodes->item(0);
+                    $config_node->appendChild($system_webServer_node);
+                } else {
+                    $config_node = $doc->createElement('configuration');
+                    $doc->appendChild($config_node);
+                    $config_node->appendChild($system_webServer_node);
+                }
+            }
+        }
+    }
+
+    $rule_fragment = $doc->createDocumentFragment();
+    $rule_fragment->appendXML($rewrite_rule);
+    $rules_node->appendChild($rule_fragment);
+
+    $doc->encoding = "UTF-8";
+    $doc->formatOutput = true;
+    saveDomDocument($doc, $filename);
+
+    return true;
 }
 
 /**
@@ -622 +646 @@
  * @param string $filename
  */
 function saveDomDocument($doc, $filename) {
-        $config = $doc->saveXML();
-        $config = preg_replace("/([^\r])\n/", "$1\r\n", $config);
-        $fp = fopen($filename, 'w');
-        fwrite($fp, $config);
-        fclose($fp);
+    $config = $doc->saveXML();
+    $config = preg_replace("/([^\r])\n/", "$1\r\n", $config);
+    $fp = fopen($filename, 'w');
+    fwrite($fp, $config);
+    fclose($fp);
 }
 
 /**
@@ -639 +663 @@
  * @param int $user_id User ID.
  */
 function admin_color_scheme_picker( $user_id ) {
-        global $_wp_admin_css_colors;
-
-        ksort( $_wp_admin_css_colors );
-
-        if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
-                // Set Default ('fresh') and Light should go first.
-                $_wp_admin_css_colors = array_filter( array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors ) );
-        }
-
-        $current_color = get_user_option( 'admin_color', $user_id );
-
-        if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
-                $current_color = 'fresh';
-        }
-
-        ?>
-        <fieldset id="color-picker" class="scheme-list">
-                <legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
-                <?php
-                wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
-                foreach ( $_wp_admin_css_colors as $color => $color_info ) :
-
-                        ?>
-                        <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
-                                <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
-                                <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
-                                <input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
-                                <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
-                                <table class="color-palette">
-                                        <tr>
-                                        <?php
-
-                                        foreach ( $color_info->colors as $html_color ) {
-                                                ?>
-                                                <td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
-                                                <?php
-                                        }
-
-                                        ?>
-                                        </tr>
-                                </table>
-                        </div>
-                        <?php
-
-                endforeach;
-
-        ?>
-        </fieldset>
-        <?php
+    global $_wp_admin_css_colors;
+
+    ksort( $_wp_admin_css_colors );
+
+    if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
+        // Set Default ('fresh') and Light should go first.
+        $_wp_admin_css_colors = array_filter( array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors ) );
+    }
+
+    $current_color = get_user_option( 'admin_color', $user_id );
+
+    if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
+        $current_color = 'fresh';
+    }
+
+    ?>
+    <fieldset id="color-picker" class="scheme-list">
+        <legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
+        <?php
+        wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
+        foreach ( $_wp_admin_css_colors as $color => $color_info ) :
+
+            ?>
+            <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
+                <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
+                <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
+                <input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
+                <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
+                <table class="color-palette">
+                    <tr>
+                    <?php
+
+                    foreach ( $color_info->colors as $html_color ) {
+                        ?>
+                        <td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
+                        <?php
+                    }
+
+                    ?>
+                    </tr>
+                </table>
+            </div>
+            <?php
+
+        endforeach;
+
+    ?>
+    </fieldset>
+    <?php
 }
 
 /**
@@ -695 +719 @@
  * @global array $_wp_admin_css_colors
  */
 function wp_color_scheme_settings() {
-        global $_wp_admin_css_colors;
+    global $_wp_admin_css_colors;
 
-        $color_scheme = get_user_option( 'admin_color' );
+    $color_scheme = get_user_option( 'admin_color' );
 
-        // It's possible to have a color scheme set that is no longer registered.
-        if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
-                $color_scheme = 'fresh';
-        }
+    // It's possible to have a color scheme set that is no longer registered.
+    if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+        $color_scheme = 'fresh';
+    }
 
-        if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
-                $icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
-        } elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
-                $icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
-        } else {
-                // Fall back to the default set of icon colors if the default scheme is missing.
-                $icon_colors = array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' );
-        }
+    if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
+        $icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
+    } elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
+        $icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
+    } else {
+        // Fall back to the default set of icon colors if the default scheme is missing.
+        $icon_colors = array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' );
+    }
 
-        echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+    echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
 }
 
 /**
  * @since 3.3.0
  */
 function _ipad_meta() {
-        if ( wp_is_mobile() ) {
-                ?>
-                <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
-                <?php
-        }
+    if ( wp_is_mobile() ) {
+        ?>
+        <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
+        <?php
+    }
 }
 
 /**
@@ -738 +762 @@
  * @return array The Heartbeat response.
  */
 function wp_check_locked_posts( $response, $data, $screen_id ) {
-        $checked = array();
+    $checked = array();
 
-        if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
-                foreach ( $data['wp-check-locked-posts'] as $key ) {
-                        if ( ! $post_id = absint( substr( $key, 5 ) ) )
-                                continue;
+    if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+        foreach ( $data['wp-check-locked-posts'] as $key ) {
+            if ( ! $post_id = absint( substr( $key, 5 ) ) )
+                continue;
 
-                        if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
-                                $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
+            if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
+                $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
-                                if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
-                                        $send['avatar_src'] = $matches[1];
+                if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+                    $send['avatar_src'] = $matches[1];
 
-                                $checked[$key] = $send;
-                        }
-                }
-        }
+                $checked[$key] = $send;
+            }
+        }
+    }
 
-        if ( ! empty( $checked ) )
-                $response['wp-check-locked-posts'] = $checked;
+    if ( ! empty( $checked ) )
+        $response['wp-check-locked-posts'] = $checked;
 
-        return $response;
+    return $response;
 }
 
 /**
@@ -773 +797 @@
  * @return array The Heartbeat response.
  */
 function wp_refresh_post_lock( $response, $data, $screen_id ) {
-        if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
-                $received = $data['wp-refresh-post-lock'];
-                $send = array();
+    if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+        $received = $data['wp-refresh-post-lock'];
+        $send = array();
 
-                if ( ! $post_id = absint( $received['post_id'] ) )
-                        return $response;
+        if ( ! $post_id = absint( $received['post_id'] ) )
+            return $response;
 
-                if ( ! current_user_can('edit_post', $post_id) )
-                        return $response;
+        if ( ! current_user_can('edit_post', $post_id) )
+            return $response;
 
-                if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
-                        $error = array(
-                                'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
-                        );
+        if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
+            $error = array(
+                'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
+            );
 
-                        if ( $avatar = get_avatar( $user->ID, 64 ) ) {
-                                if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
-                                        $error['avatar_src'] = $matches[1];
-                        }
+            if ( $avatar = get_avatar( $user->ID, 64 ) ) {
+                if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+                    $error['avatar_src'] = $matches[1];
+            }
 
-                        $send['lock_error'] = $error;
-                } else {
-                        if ( $new_lock = wp_set_post_lock( $post_id ) )
-                                $send['new_lock'] = implode( ':', $new_lock );
-                }
+            $send['lock_error'] = $error;
+        } else {
+            if ( $new_lock = wp_set_post_lock( $post_id ) )
+                $send['new_lock'] = implode( ':', $new_lock );
+        }
 
-                $response['wp-refresh-post-lock'] = $send;
-        }
+        $response['wp-refresh-post-lock'] = $send;
+    }
 
-        return $response;
+    return $response;
 }
 
 /**
@@ -816 +840 @@
  * @return array The Heartbeat response.
  */
 function wp_refresh_post_nonces( $response, $data, $screen_id ) {
-        if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
-                $received = $data['wp-refresh-post-nonces'];
-                $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
-
-                if ( ! $post_id = absint( $received['post_id'] ) ) {
-                        return $response;
-                }
-
-                if ( ! current_user_can( 'edit_post', $post_id ) ) {
-                        return $response;
-                }
-
-                $response['wp-refresh-post-nonces'] = array(
-                        'replace' => array(
-                                'getpermalinknonce' => wp_create_nonce('getpermalink'),
-                                'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
-                                'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
-                                '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
-                                '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
-                        ),
-                        'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
-                );
-        }
-
-        return $response;
+    if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+        $received = $data['wp-refresh-post-nonces'];
+        $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
+
+        if ( ! $post_id = absint( $received['post_id'] ) ) {
+            return $response;
+        }
+
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return $response;
+        }
+
+        $response['wp-refresh-post-nonces'] = array(
+            'replace' => array(
+                'getpermalinknonce' => wp_create_nonce('getpermalink'),
+                'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
+                'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
+                '_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
+                '_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+            ),
+            'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
+        );
+    }
+
+    return $response;
 }
 
 /**
@@ -854 +878 @@
  * @return array Filtered Heartbeat settings.
  */
 function wp_heartbeat_set_suspension( $settings ) {
-        global $pagenow;
+    global $pagenow;
 
-        if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
-                $settings['suspension'] = 'disable';
-        }
+    if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
+        $settings['suspension'] = 'disable';
+    }
 
-        return $settings;
+    return $settings;
 }
 
 /**
@@ -873 +897 @@
  * @return array The Heartbeat response.
  */
 function heartbeat_autosave( $response, $data ) {
-        if ( ! empty( $data['wp_autosave'] ) ) {
-                $saved = wp_autosave( $data['wp_autosave'] );
-
-                if ( is_wp_error( $saved ) ) {
-                        $response['wp_autosave'] = array( 'success' => false, 'message' => $saved->get_error_message() );
-                } elseif ( empty( $saved ) ) {
-                        $response['wp_autosave'] = array( 'success' => false, 'message' => __( 'Error while saving.' ) );
-                } else {
-                        /* translators: draft saved date format, see https://secure.php.net/date */
-                        $draft_saved_date_format = __( 'g:i:s a' );
-                        /* translators: %s: date and time */
-                        $response['wp_autosave'] = array( 'success' => true, 'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ) );
-                }
-        }
-
-        return $response;
+    if ( ! empty( $data['wp_autosave'] ) ) {
+        $saved = wp_autosave( $data['wp_autosave'] );
+
+        if ( is_wp_error( $saved ) ) {
+            $response['wp_autosave'] = array( 'success' => false, 'message' => $saved->get_error_message() );
+        } elseif ( empty( $saved ) ) {
+            $response['wp_autosave'] = array( 'success' => false, 'message' => __( 'Error while saving.' ) );
+        } else {
+            /* translators: draft saved date format, see https://secure.php.net/date */
+            $draft_saved_date_format = __( 'g:i:s a' );
+            /* translators: %s: date and time */
+            $response['wp_autosave'] = array( 'success' => true, 'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ) );
+        }
+    }
+
+    return $response;
 }
 
 /**
@@ -900 +924 @@
  * @since 4.2.0
  */
 function wp_admin_canonical_url() {
-        $removable_query_args = wp_removable_query_args();
-
-        if ( empty( $removable_query_args ) ) {
-                return;
-        }
-
-        // Ensure we're using an absolute URL.
-        $current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-        $filtered_url = remove_query_arg( $removable_query_args, $current_url );
-        ?>
-        <link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
-        <script>
-                if ( window.history.replaceState ) {
-                        window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
-                }
-        </script>
+    $removable_query_args = wp_removable_query_args();
+
+    if ( empty( $removable_query_args ) ) {
+        return;
+    }
+
+    // Ensure we're using an absolute URL.
+    $current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+    $filtered_url = remove_query_arg( $removable_query_args, $current_url );
+    ?>
+    <link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
+    <script>
+        if ( window.history.replaceState ) {
+            window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );
+        }
+    </script>
 <?php
 }
 
@@ -928 +952 @@
  * @since 4.6.0
  */
 function wp_page_reload_on_back_button_js() {
-        ?>
-        <script>
-                if ( typeof performance !== 'undefined' && performance.navigation && performance.navigation.type === 2 ) {
-                        document.location.reload( true );
-                }
-        </script>
-        <?php
+    ?>
+    <script>
+        if ( typeof performance !== 'undefined' && performance.navigation && performance.navigation.type === 2 ) {
+            document.location.reload( true );
+        }
+    </script>
+    <?php
 }

src/wp-admin/link-add.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! current_user_can('manage_links') )
-        wp_die(__('Sorry, you are not allowed to add links to this site.'));
+    wp_die(__('Sorry, you are not allowed to add links to this site.'));
 
 $title = __('Add New Link');
 $parent_file = 'link-manager.php';
 
-wp_reset_vars( array('action', 'cat_id', 'link_id' ) );
+$action = wp_assign_request_var('action');
+$cat_id = wp_assign_request_var('cat_id');
+$link_id = wp_assign_request_var('link_id');
 
 wp_enqueue_script('link');
 wp_enqueue_script('xfn');
 
 if ( wp_is_mobile() )
-        wp_enqueue_script( 'jquery-touch-punch' );
+    wp_enqueue_script( 'jquery-touch-punch' );
 
 $link = get_default_link_to_edit();
 include( ABSPATH . 'wp-admin/edit-link-form.php' );

src/wp-admin/link.php

@@ -12 +12 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
+$action = wp_assign_request_var('action');
+$cat_id = wp_assign_request_var('cat_id');
+$link_id = wp_assign_request_var('link_id');
 
 if ( ! current_user_can('manage_links') )
-        wp_link_manager_disabled_message();
+    wp_link_manager_disabled_message();
 
 if ( !empty($_POST['deletebookmarks']) )
-        $action = 'deletebookmarks';
+    $action = 'deletebookmarks';
 if ( !empty($_POST['move']) )
-        $action = 'move';
+    $action = 'move';
 if ( !empty($_POST['linkcheck']) )
-        $linkcheck = $_POST['linkcheck'];
+    $linkcheck = $_POST['linkcheck'];
 
 $this_file = admin_url('link-manager.php');
 
 switch ($action) {
-        case 'deletebookmarks' :
-                check_admin_referer('bulk-bookmarks');
+    case 'deletebookmarks' :
+        check_admin_referer('bulk-bookmarks');
 
-                // For each link id (in $linkcheck[]) change category to selected value.
-                if (count($linkcheck) == 0) {
-                        wp_redirect($this_file);
-                        exit;
-                }
+        // For each link id (in $linkcheck[]) change category to selected value.
+        if (count($linkcheck) == 0) {
+            wp_redirect($this_file);
+            exit;
+        }
 
-                $deleted = 0;
-                foreach ($linkcheck as $link_id) {
-                        $link_id = (int) $link_id;
+        $deleted = 0;
+        foreach ($linkcheck as $link_id) {
+            $link_id = (int) $link_id;
 
-                        if ( wp_delete_link($link_id) )
-                                $deleted++;
-                }
+            if ( wp_delete_link($link_id) )
+                $deleted++;
+        }
 
-                wp_redirect("$this_file?deleted=$deleted");
-                exit;
+        wp_redirect("$this_file?deleted=$deleted");
+        exit;
 
-        case 'move' :
-                check_admin_referer('bulk-bookmarks');
+    case 'move' :
+        check_admin_referer('bulk-bookmarks');
 
-                // For each link id (in $linkcheck[]) change category to selected value.
-                if (count($linkcheck) == 0) {
-                        wp_redirect($this_file);
-                        exit;
-                }
-                $all_links = join(',', $linkcheck);
-                /*
-                 * Should now have an array of links we can change:
-                 *     $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
-                 */
+        // For each link id (in $linkcheck[]) change category to selected value.
+        if (count($linkcheck) == 0) {
+            wp_redirect($this_file);
+            exit;
+        }
+        $all_links = join(',', $linkcheck);
+        /*
+         * Should now have an array of links we can change:
+         *     $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+         */
 
-                wp_redirect($this_file);
-                exit;
+        wp_redirect($this_file);
+        exit;
 
-        case 'add' :
-                check_admin_referer('add-bookmark');
+    case 'add' :
+        check_admin_referer('add-bookmark');
 
-                $redir = wp_get_referer();
-                if ( add_link() )
-                        $redir = add_query_arg( 'added', 'true', $redir );
+        $redir = wp_get_referer();
+        if ( add_link() )
+            $redir = add_query_arg( 'added', 'true', $redir );
 
-                wp_redirect( $redir );
-                exit;
+        wp_redirect( $redir );
+        exit;
 
-        case 'save' :
-                $link_id = (int) $_POST['link_id'];
-                check_admin_referer('update-bookmark_' . $link_id);
+    case 'save' :
+        $link_id = (int) $_POST['link_id'];
+        check_admin_referer('update-bookmark_' . $link_id);
 
-                edit_link($link_id);
+        edit_link($link_id);
 
-                wp_redirect($this_file);
-                exit;
+        wp_redirect($this_file);
+        exit;
 
-        case 'delete' :
-                $link_id = (int) $_GET['link_id'];
-                check_admin_referer('delete-bookmark_' . $link_id);
+    case 'delete' :
+        $link_id = (int) $_GET['link_id'];
+        check_admin_referer('delete-bookmark_' . $link_id);
 
-                wp_delete_link($link_id);
+        wp_delete_link($link_id);
 
-                wp_redirect($this_file);
-                exit;
+        wp_redirect($this_file);
+        exit;
 
-        case 'edit' :
-                wp_enqueue_script('link');
-                wp_enqueue_script('xfn');
+    case 'edit' :
+        wp_enqueue_script('link');
+        wp_enqueue_script('xfn');
 
-                if ( wp_is_mobile() )
-                        wp_enqueue_script( 'jquery-touch-punch' );
+        if ( wp_is_mobile() )
+            wp_enqueue_script( 'jquery-touch-punch' );
 
-                $parent_file = 'link-manager.php';
-                $submenu_file = 'link-manager.php';
-                $title = __('Edit Link');
+        $parent_file = 'link-manager.php';
+        $submenu_file = 'link-manager.php';
+        $title = __('Edit Link');
 
-                $link_id = (int) $_GET['link_id'];
+        $link_id = (int) $_GET['link_id'];
 
-                if (!$link = get_link_to_edit($link_id))
-                        wp_die(__('Link not found.'));
+        if (!$link = get_link_to_edit($link_id))
+            wp_die(__('Link not found.'));
 
-                include( ABSPATH . 'wp-admin/edit-link-form.php' );
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
-                break;
+        include( ABSPATH . 'wp-admin/edit-link-form.php' );
+        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        break;
 
-        default :
-                break;
+    default :
+        break;
 }

src/wp-admin/media.php

@@ -12 +12 @@
 $parent_file = 'upload.php';
 $submenu_file = 'upload.php';
 
-wp_reset_vars(array('action'));
+$action = wp_assign_request_var('action');
 
 switch ( $action ) {
 case 'editattachment' :
-        $attachment_id = (int) $_POST['attachment_id'];
-        check_admin_referer('media-form');
-
-        if ( !current_user_can('edit_post', $attachment_id) )
-                wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-        $errors = media_upload_form_handler();
-
-        if ( empty($errors) ) {
-                $location = 'media.php';
-                if ( $referer = wp_get_original_referer() ) {
-                        if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-                                $location = $referer;
-                }
-                if ( false !== strpos($location, 'upload.php') ) {
-                        $location = remove_query_arg('message', $location);
-                        $location = add_query_arg('posted',     $attachment_id, $location);
-                } elseif ( false !== strpos($location, 'media.php') ) {
-                        $location = add_query_arg('message', 'updated', $location);
-                }
-                wp_redirect($location);
-                exit;
-        }
-
-        // No break.
+    $attachment_id = (int) $_POST['attachment_id'];
+    check_admin_referer('media-form');
+
+    if ( !current_user_can('edit_post', $attachment_id) )
+        wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+    $errors = media_upload_form_handler();
+
+    if ( empty($errors) ) {
+        $location = 'media.php';
+        if ( $referer = wp_get_original_referer() ) {
+            if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
+                $location = $referer;
+        }
+        if ( false !== strpos($location, 'upload.php') ) {
+            $location = remove_query_arg('message', $location);
+            $location = add_query_arg('posted', $attachment_id, $location);
+        } elseif ( false !== strpos($location, 'media.php') ) {
+            $location = add_query_arg('message', 'updated', $location);
+        }
+        wp_redirect($location);
+        exit;
+    }
+
+    // No break.
 case 'edit' :
-        $title = __('Edit Media');
-
-        if ( empty($errors) )
-                $errors = null;
-
-        if ( empty( $_GET['attachment_id'] ) ) {
-                wp_redirect( admin_url('upload.php') );
-                exit();
-        }
-        $att_id = (int) $_GET['attachment_id'];
-
-        if ( !current_user_can('edit_post', $att_id) )
-                wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-        $att = get_post($att_id);
-
-        if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-        if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-        if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
-
-        add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-
-        wp_enqueue_script( 'wp-ajax-response' );
-        wp_enqueue_script('image-edit');
-        wp_enqueue_style('imgareaselect');
-
-        get_current_screen()->add_help_tab( array(
-                'id'      => 'overview',
-                'title'   => __('Overview'),
-                'content' =>
-                        '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-                        '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-                        '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-                        '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-        ) );
-
-        get_current_screen()->set_help_sidebar(
-        '<p><strong>' . __('For more information:') . '</strong></p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
-        '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
-        );
-
-        require( ABSPATH . 'wp-admin/admin-header.php' );
-
-        $parent_file = 'upload.php';
-        $message = '';
-        $class = '';
-        if ( isset($_GET['message']) ) {
-                switch ( $_GET['message'] ) {
-                        case 'updated' :
-                                $message = __('Media file updated.');
-                                $class = 'updated';
-                                break;
-                }
-        }
-        if ( $message )
-                echo "<div id='message' class='$class'><p>$message</p></div>\n";
+    $title = __('Edit Media');
+
+    if ( empty($errors) )
+        $errors = null;
+
+    if ( empty( $_GET['attachment_id'] ) ) {
+        wp_redirect( admin_url('upload.php') );
+        exit();
+    }
+    $att_id = (int) $_GET['attachment_id'];
+
+    if ( !current_user_can('edit_post', $att_id) )
+        wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+    $att = get_post($att_id);
+
+    if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?') );
+    if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn&#8217;t an attachment. Please go back and try again.') );
+    if ( $att->post_status == 'trash' ) wp_die( __('You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+
+    add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+
+    wp_enqueue_script( 'wp-ajax-response' );
+    wp_enqueue_script('image-edit');
+    wp_enqueue_style('imgareaselect');
+
+    get_current_screen()->add_help_tab( array(
+        'id'      => 'overview',
+        'title'   => __('Overview'),
+        'content' =>
+            '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+            '<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+            '<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+            '<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
+    ) );
+
+    get_current_screen()->set_help_sidebar(
+    '<p><strong>' . __('For more information:') . '</strong></p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
+    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+    );
+
+    require( ABSPATH . 'wp-admin/admin-header.php' );
+
+    $parent_file = 'upload.php';
+    $message = '';
+    $class = '';
+    if ( isset($_GET['message']) ) {
+        switch ( $_GET['message'] ) {
+            case 'updated' :
+                $message = __('Media file updated.');
+                $class = 'updated';
+                break;
+        }
+    }
+    if ( $message )
+        echo "<div id='message' class='$class'><p>$message</p></div>\n";
 
 ?>
 
@@ -109 +109 @@
 
 <?php
 if ( current_user_can( 'upload_files' ) ) { ?>
-        <a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a>
+    <a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a>
 <?php } ?>
 
 <hr class="wp-header-end">
@@ -138 +138 @@
 
 <?php
 
-        require( ABSPATH . 'wp-admin/admin-footer.php' );
+    require( ABSPATH . 'wp-admin/admin-footer.php' );
 
-        exit;
+    exit;
 
 default:
-        wp_redirect( admin_url('upload.php') );
-        exit;
+    wp_redirect( admin_url('upload.php') );
+    exit;
 
 }

src/wp-admin/options-head.php

@@ -8 +8 @@
  * @subpackage Administration
  */
 
-wp_reset_vars( array( 'action' ) );
+$action = wp_assign_request_var('action');
 
 if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
-        // For back-compat with plugins that don't use the Settings API and just set updated=1 in the redirect.
-        add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+    // For back-compat with plugins that don't use the Settings API and just set updated=1 in the redirect.
+    add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 }
 
 settings_errors();

src/wp-admin/options.php

@@ -22 +22 @@
 $this_file = 'options.php';
 $parent_file = 'options-general.php';
 
-wp_reset_vars(array('action', 'option_page'));
+$action = wp_assign_request_var('action');
+$option_page = wp_assign_request_var('option_page');
 
 $capability = 'manage_options';
 
 // This is for back compat and will eventually be removed.
 if ( empty($option_page) ) {
-        $option_page = 'options';
+    $option_page = 'options';
 } else {
 
-        /**
-         * Filters the capability required when using the Settings API.
-         *
-         * By default, the options groups for all registered settings require the manage_options capability.
-         * This filter is required to change the capability required for a certain options page.
-         *
-         * @since 3.2.0
-         *
-         * @param string $capability The capability used for the page, which is manage_options by default.
-         */
-        $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
+    /**
+     * Filters the capability required when using the Settings API.
+     *
+     * By default, the options groups for all registered settings require the manage_options capability.
+     * This filter is required to change the capability required for a certain options page.
+     *
+     * @since 3.2.0
+     *
+     * @param string $capability The capability used for the page, which is manage_options by default.
+     */
+    $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
 }
 
 if ( ! current_user_can( $capability ) ) {
-        wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                '<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</p>',
-                403
-        );
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</p>',
+        403
+    );
 }
 
 // Handle admin email change requests
 if ( is_multisite() ) {
-        if ( ! empty($_GET[ 'adminhash' ] ) ) {
-                $new_admin_details = get_option( 'adminhash' );
-                $redirect = 'options-general.php?updated=false';
-                if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && !empty($new_admin_details[ 'newemail' ]) ) {
-                        update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
-                        delete_option( 'adminhash' );
-                        delete_option( 'new_admin_email' );
-                        $redirect = 'options-general.php?updated=true';
-                }
-                wp_redirect( admin_url( $redirect ) );
-                exit;
-        } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
-                check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
-                delete_option( 'adminhash' );
-                delete_option( 'new_admin_email' );
-                wp_redirect( admin_url( 'options-general.php?updated=true' ) );
-                exit;
-        }
+    if ( ! empty($_GET[ 'adminhash' ] ) ) {
+        $new_admin_details = get_option( 'adminhash' );
+        $redirect = 'options-general.php?updated=false';
+        if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && !empty($new_admin_details[ 'newemail' ]) ) {
+            update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
+            delete_option( 'adminhash' );
+            delete_option( 'new_admin_email' );
+            $redirect = 'options-general.php?updated=true';
+        }
+        wp_redirect( admin_url( $redirect ) );
+        exit;
+    } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
+        check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
+        delete_option( 'adminhash' );
+        delete_option( 'new_admin_email' );
+        wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+        exit;
+    }
 }
 
 if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update' != $action ) {
-        wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
-                403
-        );
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+        403
+    );
 }
 
 $whitelist_options = array(
-        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
-        'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-        'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-        'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-        'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
+    'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
+    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
+    'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
+    'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
 if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
-        $whitelist_options['reading'][] = 'blog_charset';
+    $whitelist_options['reading'][] = 'blog_charset';
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
-        $whitelist_options['writing'][] = 'use_smilies';
-        $whitelist_options['writing'][] = 'use_balanceTags';
+    $whitelist_options['writing'][] = 'use_smilies';
+    $whitelist_options['writing'][] = 'use_balanceTags';
 }
 
 if ( !is_multisite() ) {
-        if ( !defined( 'WP_SITEURL' ) )
-                $whitelist_options['general'][] = 'siteurl';
-        if ( !defined( 'WP_HOME' ) )
-                $whitelist_options['general'][] = 'home';
+    if ( !defined( 'WP_SITEURL' ) )
+        $whitelist_options['general'][] = 'siteurl';
+    if ( !defined( 'WP_HOME' ) )
+        $whitelist_options['general'][] = 'home';
 
-        $whitelist_options['general'][] = 'admin_email';
-        $whitelist_options['general'][] = 'users_can_register';
-        $whitelist_options['general'][] = 'default_role';
+    $whitelist_options['general'][] = 'admin_email';
+    $whitelist_options['general'][] = 'users_can_register';
+    $whitelist_options['general'][] = 'default_role';
 
-        $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-        $whitelist_options['writing'][] = 'ping_sites';
+    $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+    $whitelist_options['writing'][] = 'ping_sites';
 
-        $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
+    $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
-        // If upload_url_path and upload_path are both default values, they're locked.
-        if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
-                $whitelist_options['media'][] = 'upload_path';
-                $whitelist_options['media'][] = 'upload_url_path';
-        }
+    // If upload_url_path and upload_path are both default values, they're locked.
+    if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+        $whitelist_options['media'][] = 'upload_path';
+        $whitelist_options['media'][] = 'upload_url_path';
+    }
 } else {
-        $whitelist_options['general'][] = 'new_admin_email';
-
-        /**
-         * Filters whether the post-by-email functionality is enabled.
-         *
-         * @since 3.0.0
-         *
-         * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
-         */
-        if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-                $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+    $whitelist_options['general'][] = 'new_admin_email';
+
+    /**
+     * Filters whether the post-by-email functionality is enabled.
+     *
+     * @since 3.0.0
+     *
+     * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
+     */
+    if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+        $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 
 /**
@@ -148 +149 @@
  * If $_GET['action'] == 'update' we are saving settings sent from a settings page
  */
 if ( 'update' == $action ) {
-        if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
-                $unregistered = true;
-                check_admin_referer( 'update-options' );
-        } else {
-                $unregistered = false;
-                check_admin_referer( $option_page . '-options' );
-        }
-
-        if ( !isset( $whitelist_options[ $option_page ] ) )
-                wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
-
-        if ( 'options' == $option_page ) {
-                if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
-                        wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
-                }
-                $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
-        } else {
-                $options = $whitelist_options[ $option_page ];
-        }
-
-        if ( 'general' == $option_page ) {
-                // Handle custom date/time formats.
-                if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
-                        $_POST['date_format'] = $_POST['date_format_custom'];
-                if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
-                        $_POST['time_format'] = $_POST['time_format_custom'];
-                // Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
-                if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
-                        $_POST['gmt_offset'] = $_POST['timezone_string'];
-                        $_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
-                        $_POST['timezone_string'] = '';
-                }
-
-                // Handle translation install.
-                if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
-                        require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
-
-                        if ( wp_can_install_language_pack() ) {
-                                $language = wp_download_language_pack( $_POST['WPLANG'] );
-                                if ( $language ) {
-                                        $_POST['WPLANG'] = $language;
-                                }
-                        }
-                }
-        }
-
-        if ( $options ) {
-                $user_language_old = get_user_locale();
-
-                foreach ( $options as $option ) {
-                        if ( $unregistered ) {
-                                _deprecated_argument( 'options.php', '2.7.0',
-                                        sprintf(
-                                                /* translators: %s: the option/setting */
-                                                __( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
-                                                '<code>' . $option . '</code>'
-                                        )
-                                );
-                        }
-
-                        $option = trim( $option );
-                        $value = null;
-                        if ( isset( $_POST[ $option ] ) ) {
-                                $value = $_POST[ $option ];
-                                if ( ! is_array( $value ) ) {
-                                        $value = trim( $value );
-                                }
-                                $value = wp_unslash( $value );
-                        }
-                        update_option( $option, $value );
-                }
-
-                /*
-                 * Switch translation in case WPLANG was changed.
-                 * The global $locale is used in get_locale() which is
-                 * used as a fallback in get_user_locale().
-                 */
-                unset( $GLOBALS['locale'] );
-                $user_language_new = get_user_locale();
-                if ( $user_language_old !== $user_language_new  ) {
-                        load_default_textdomain( $user_language_new );
-                }
-        }
-
-        /**
-         * Handle settings errors and return to options page
-         */
-        // If no settings errors were registered add a general 'updated' message.
-        if ( !count( get_settings_errors() ) )
-                add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
-        set_transient('settings_errors', get_settings_errors(), 30);
-
-        /**
-         * Redirect back to the settings page that was submitted
-         */
-        $goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
-        wp_redirect( $goback );
-        exit;
+    if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+        $unregistered = true;
+        check_admin_referer( 'update-options' );
+    } else {
+        $unregistered = false;
+        check_admin_referer( $option_page . '-options' );
+    }
+
+    if ( !isset( $whitelist_options[ $option_page ] ) )
+        wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+
+    if ( 'options' == $option_page ) {
+        if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
+            wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
+        }
+        $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+    } else {
+        $options = $whitelist_options[ $option_page ];
+    }
+
+    if ( 'general' == $option_page ) {
+        // Handle custom date/time formats.
+        if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+            $_POST['date_format'] = $_POST['date_format_custom'];
+        if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+            $_POST['time_format'] = $_POST['time_format_custom'];
+        // Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
+        if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+            $_POST['gmt_offset'] = $_POST['timezone_string'];
+            $_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
+            $_POST['timezone_string'] = '';
+        }
+
+        // Handle translation install.
+        if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
+            require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+
+            if ( wp_can_install_language_pack() ) {
+                $language = wp_download_language_pack( $_POST['WPLANG'] );
+                if ( $language ) {
+                    $_POST['WPLANG'] = $language;
+                }
+            }
+        }
+    }
+
+    if ( $options ) {
+        $user_language_old = get_user_locale();
+
+        foreach ( $options as $option ) {
+            if ( $unregistered ) {
+                _deprecated_argument( 'options.php', '2.7.0',
+                    sprintf(
+                        /* translators: %s: the option/setting */
+                        __( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
+                        '<code>' . $option . '</code>'
+                    )
+                );
+            }
+
+            $option = trim( $option );
+            $value = null;
+            if ( isset( $_POST[ $option ] ) ) {
+                $value = $_POST[ $option ];
+                if ( ! is_array( $value ) ) {
+                    $value = trim( $value );
+                }
+                $value = wp_unslash( $value );
+            }
+            update_option( $option, $value );
+        }
+
+        /*
+         * Switch translation in case WPLANG was changed.
+         * The global $locale is used in get_locale() which is
+         * used as a fallback in get_user_locale().
+         */
+        unset( $GLOBALS['locale'] );
+        $user_language_new = get_user_locale();
+        if ( $user_language_old !== $user_language_new  ) {
+            load_default_textdomain( $user_language_new );
+        }
+    }
+
+    /**
+     * Handle settings errors and return to options page
+     */
+    // If no settings errors were registered add a general 'updated' message.
+    if ( !count( get_settings_errors() ) )
+        add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+    set_transient('settings_errors', get_settings_errors(), 30);
+
+    /**
+     * Redirect back to the settings page that was submitted
+     */
+    $goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
+    wp_redirect( $goback );
+    exit;
 }
 
 include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -261 +262 @@
 $options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
 
 foreach ( (array) $options as $option ) :
-        $disabled = false;
-        if ( $option->option_name == '' )
-                continue;
-        if ( is_serialized( $option->option_value ) ) {
-                if ( is_serialized_string( $option->option_value ) ) {
-                        // This is a serialized string, so we should display it.
-                        $value = maybe_unserialize( $option->option_value );
-                        $options_to_update[] = $option->option_name;
-                        $class = 'all-options';
-                } else {
-                        $value = 'SERIALIZED DATA';
-                        $disabled = true;
-                        $class = 'all-options disabled';
-                }
-        } else {
-                $value = $option->option_value;
-                $options_to_update[] = $option->option_name;
-                $class = 'all-options';
-        }
-        $name = esc_attr( $option->option_name );
-        ?>
+    $disabled = false;
+    if ( $option->option_name == '' )
+        continue;
+    if ( is_serialized( $option->option_value ) ) {
+        if ( is_serialized_string( $option->option_value ) ) {
+            // This is a serialized string, so we should display it.
+            $value = maybe_unserialize( $option->option_value );
+            $options_to_update[] = $option->option_name;
+            $class = 'all-options';
+        } else {
+            $value = 'SERIALIZED DATA';
+            $disabled = true;
+            $class = 'all-options disabled';
+        }
+    } else {
+        $value = $option->option_value;
+        $options_to_update[] = $option->option_name;
+        $class = 'all-options';
+    }
+    $name = esc_attr( $option->option_name );
+    ?>
 <tr>
-        <th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
+    <th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
 <td>
 <?php if ( strpos( $value, "\n" ) !== false ) : ?>
-        <textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
-                echo esc_textarea( $value );
-        ?></textarea>
-        <?php else: ?>
-                <input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
-        <?php endif ?></td>
+    <textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
+        echo esc_textarea( $value );
+    ?></textarea>
+    <?php else: ?>
+        <input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
+    <?php endif ?></td>
 </tr>
 <?php endforeach; ?>
   </table>

src/wp-admin/post.php

@@ -14 +14 @@
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars( array( 'action' ) );
+$action = wp_assign_request_var('action');
 
 if ( isset( $_GET['post'] ) )
-        $post_id = $post_ID = (int) $_GET['post'];
+     $post_id = $post_ID = (int) $_GET['post'];
 elseif ( isset( $_POST['post_ID'] ) )
-        $post_id = $post_ID = (int) $_POST['post_ID'];
+     $post_id = $post_ID = (int) $_POST['post_ID'];
 else
-        $post_id = $post_ID = 0;
+     $post_id = $post_ID = 0;
 
 /**
  * @global string  $post_type
@@ -31 +31 @@
 global $post_type, $post_type_object, $post;
 
 if ( $post_id )
-        $post = get_post( $post_id );
+    $post = get_post( $post_id );
 
 if ( $post ) {
-        $post_type = $post->post_type;
-        $post_type_object = get_post_type_object( $post_type );
+    $post_type = $post->post_type;
+    $post_type_object = get_post_type_object( $post_type );
 }
 
 if ( isset( $_POST['deletepost'] ) )
-        $action = 'delete';
+    $action = 'delete';
 elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
-        $action = 'preview';
+    $action = 'preview';
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
      strpos( $sendback, 'post.php' ) !== false ||
      strpos( $sendback, 'post-new.php' ) !== false ) {
-        if ( 'attachment' == $post_type ) {
-                $sendback = admin_url( 'upload.php' );
-        } else {
-                $sendback = admin_url( 'edit.php' );
-                if ( ! empty( $post_type ) ) {
-                        $sendback = add_query_arg( 'post_type', $post_type, $sendback );
-                }
-        }
+    if ( 'attachment' == $post_type ) {
+        $sendback = admin_url( 'upload.php' );
+    } else {
+        $sendback = admin_url( 'edit.php' );
+        if ( ! empty( $post_type ) ) {
+            $sendback = add_query_arg( 'post_type', $post_type, $sendback );
+        }
+    }
 } else {
-        $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+    $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
 }
 
 switch($action) {
 case 'post-quickdraft-save':
-        // Check nonce and capabilities
-        $nonce = $_REQUEST['_wpnonce'];
-        $error_msg = false;
+    // Check nonce and capabilities
+    $nonce = $_REQUEST['_wpnonce'];
+    $error_msg = false;
 
-        // For output of the quickdraft dashboard widget
-        require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+    // For output of the quickdraft dashboard widget
+    require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-        if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-                $error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+    if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
+        $error_msg = __( 'Unable to submit this form, please refresh and try again.' );
 
-        if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-                exit;
-        }
+    if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+        exit;
+    }
 
-        if ( $error_msg )
-                return wp_dashboard_quick_press( $error_msg );
+    if ( $error_msg )
+        return wp_dashboard_quick_press( $error_msg );
 
-        $post = get_post( $_REQUEST['post_ID'] );
-        check_admin_referer( 'add-' . $post->post_type );
+    $post = get_post( $_REQUEST['post_ID'] );
+    check_admin_referer( 'add-' . $post->post_type );
 
-        $_POST['comment_status'] = get_default_comment_status( $post->post_type );
-        $_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+    $_POST['comment_status'] = get_default_comment_status( $post->post_type );
+    $_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
 
-        edit_post();
-        wp_dashboard_quick_press();
-        exit;
+    edit_post();
+    wp_dashboard_quick_press();
+    exit;
 
 case 'postajaxpost':
 case 'post':
-        check_admin_referer( 'add-' . $post_type );
-        $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-        redirect_post( $post_id );
-        exit();
+    check_admin_referer( 'add-' . $post_type );
+    $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
+    redirect_post( $post_id );
+    exit();
 
 case 'edit':
-        $editing = true;
-
-        if ( empty( $post_id ) ) {
-                wp_redirect( admin_url('post.php') );
-                exit();
-        }
-
-        if ( ! $post )
-                wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
-
-        if ( ! $post_type_object )
-                wp_die( __( 'Invalid post type.' ) );
-
-        if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-                wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
-        }
-
-        if ( ! current_user_can( 'edit_post', $post_id ) )
-                wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
-
-        if ( 'trash' == $post->post_status )
-                wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
-
-        if ( ! empty( $_GET['get-post-lock'] ) ) {
-                check_admin_referer( 'lock-post_' . $post_id );
-                wp_set_post_lock( $post_id );
-                wp_redirect( get_edit_post_link( $post_id, 'url' ) );
-                exit();
-        }
-
-        $post_type = $post->post_type;
-        if ( 'post' == $post_type ) {
-                $parent_file = "edit.php";
-                $submenu_file = "edit.php";
-                $post_new_file = "post-new.php";
-        } elseif ( 'attachment' == $post_type ) {
-                $parent_file = 'upload.php';
-                $submenu_file = 'upload.php';
-                $post_new_file = 'media-new.php';
-        } else {
-                if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
-                        $parent_file = $post_type_object->show_in_menu;
-                else
-                        $parent_file = "edit.php?post_type=$post_type";
-                $submenu_file = "edit.php?post_type=$post_type";
-                $post_new_file = "post-new.php?post_type=$post_type";
-        }
-
-        if ( ! wp_check_post_lock( $post->ID ) ) {
-                $active_post_lock = wp_set_post_lock( $post->ID );
-
-                if ( 'attachment' !== $post_type )
-                        wp_enqueue_script('autosave');
-        }
-
-        if ( is_multisite() ) {
-                add_action( 'admin_footer', '_admin_notice_post_locked' );
-        } else {
-                $check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
-
-                if ( count( $check_users ) > 1 )
-                        add_action( 'admin_footer', '_admin_notice_post_locked' );
-
-                unset( $check_users );
-        }
-
-        $title = $post_type_object->labels->edit_item;
-        $post = get_post($post_id, OBJECT, 'edit');
-
-        if ( post_type_supports($post_type, 'comments') ) {
-                wp_enqueue_script('admin-comments');
-                enqueue_comment_hotkeys_js();
-        }
-
-        include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
-
-        break;
+    $editing = true;
+
+    if ( empty( $post_id ) ) {
+        wp_redirect( admin_url('post.php') );
+        exit();
+    }
+
+    if ( ! $post )
+        wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+
+    if ( ! $post_type_object )
+        wp_die( __( 'Invalid post type.' ) );
+
+    if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
+        wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+    }
+
+    if ( ! current_user_can( 'edit_post', $post_id ) )
+        wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+
+    if ( 'trash' == $post->post_status )
+        wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+
+    if ( ! empty( $_GET['get-post-lock'] ) ) {
+        check_admin_referer( 'lock-post_' . $post_id );
+        wp_set_post_lock( $post_id );
+        wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+        exit();
+    }
+
+    $post_type = $post->post_type;
+    if ( 'post' == $post_type ) {
+        $parent_file = "edit.php";
+        $submenu_file = "edit.php";
+        $post_new_file = "post-new.php";
+    } elseif ( 'attachment' == $post_type ) {
+        $parent_file = 'upload.php';
+        $submenu_file = 'upload.php';
+        $post_new_file = 'media-new.php';
+    } else {
+        if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+            $parent_file = $post_type_object->show_in_menu;
+        else
+            $parent_file = "edit.php?post_type=$post_type";
+        $submenu_file = "edit.php?post_type=$post_type";
+        $post_new_file = "post-new.php?post_type=$post_type";
+    }
+
+    if ( ! wp_check_post_lock( $post->ID ) ) {
+        $active_post_lock = wp_set_post_lock( $post->ID );
+
+        if ( 'attachment' !== $post_type )
+            wp_enqueue_script('autosave');
+    }
+
+    if ( is_multisite() ) {
+        add_action( 'admin_footer', '_admin_notice_post_locked' );
+    } else {
+        $check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+
+        if ( count( $check_users ) > 1 )
+            add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+        unset( $check_users );
+    }
+
+    $title = $post_type_object->labels->edit_item;
+    $post = get_post($post_id, OBJECT, 'edit');
+
+    if ( post_type_supports($post_type, 'comments') ) {
+        wp_enqueue_script('admin-comments');
+        enqueue_comment_hotkeys_js();
+    }
+
+    include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+
+    break;
 
 case 'editattachment':
-        check_admin_referer('update-post_' . $post_id);
+    check_admin_referer('update-post_' . $post_id);
 
-        // Don't let these be changed
-        unset($_POST['guid']);
-        $_POST['post_type'] = 'attachment';
+    // Don't let these be changed
+    unset($_POST['guid']);
+    $_POST['post_type'] = 'attachment';
 
-        // Update the thumbnail filename
-        $newmeta = wp_get_attachment_metadata( $post_id, true );
-        $newmeta['thumb'] = $_POST['thumb'];
+    // Update the thumbnail filename
+    $newmeta = wp_get_attachment_metadata( $post_id, true );
+    $newmeta['thumb'] = $_POST['thumb'];
 
-        wp_update_attachment_metadata( $post_id, $newmeta );
+    wp_update_attachment_metadata( $post_id, $newmeta );
 
 case 'editpost':
-        check_admin_referer('update-post_' . $post_id);
+    check_admin_referer('update-post_' . $post_id);
 
-        $post_id = edit_post();
+    $post_id = edit_post();
 
-        // Session cookie flag that the post was saved
-        if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-                setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
-        }
+    // Session cookie flag that the post was saved
+    if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+        setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+    }
 
-        redirect_post($post_id); // Send user on their way while we keep working
+    redirect_post($post_id); // Send user on their way while we keep working
 
-        exit();
+    exit();
 
 case 'trash':
-        check_admin_referer('trash-post_' . $post_id);
+    check_admin_referer('trash-post_' . $post_id);
 
-        if ( ! $post )
-                wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+    if ( ! $post )
+        wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
 
-        if ( ! $post_type_object )
-                wp_die( __( 'Invalid post type.' ) );
+    if ( ! $post_type_object )
+        wp_die( __( 'Invalid post type.' ) );
 
-        if ( ! current_user_can( 'delete_post', $post_id ) )
-                wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+    if ( ! current_user_can( 'delete_post', $post_id ) )
+        wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
 
-        if ( $user_id = wp_check_post_lock( $post_id ) ) {
-                $user = get_userdata( $user_id );
-                wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
-        }
+    if ( $user_id = wp_check_post_lock( $post_id ) ) {
+        $user = get_userdata( $user_id );
+        wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+    }
 
-        if ( ! wp_trash_post( $post_id ) )
-                wp_die( __( 'Error in moving to Trash.' ) );
+    if ( ! wp_trash_post( $post_id ) )
+        wp_die( __( 'Error in moving to Trash.' ) );
 
-        wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
-        exit();
+    wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+    exit();
 
 case 'untrash':
-        check_admin_referer('untrash-post_' . $post_id);
+    check_admin_referer('untrash-post_' . $post_id);
 
-        if ( ! $post )
-                wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+    if ( ! $post )
+        wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
 
-        if ( ! $post_type_object )
-                wp_die( __( 'Invalid post type.' ) );
+    if ( ! $post_type_object )
+        wp_die( __( 'Invalid post type.' ) );
 
-        if ( ! current_user_can( 'delete_post', $post_id ) )
-                wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+    if ( ! current_user_can( 'delete_post', $post_id ) )
+        wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
 
-        if ( ! wp_untrash_post( $post_id ) )
-                wp_die( __( 'Error in restoring from Trash.' ) );
+    if ( ! wp_untrash_post( $post_id ) )
+        wp_die( __( 'Error in restoring from Trash.' ) );
 
-        wp_redirect( add_query_arg('untrashed', 1, $sendback) );
-        exit();
+    wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+    exit();
 
 case 'delete':
-        check_admin_referer('delete-post_' . $post_id);
+    check_admin_referer('delete-post_' . $post_id);
 
-        if ( ! $post )
-                wp_die( __( 'This item has already been deleted.' ) );
+    if ( ! $post )
+        wp_die( __( 'This item has already been deleted.' ) );
 
-        if ( ! $post_type_object )
-                wp_die( __( 'Invalid post type.' ) );
+    if ( ! $post_type_object )
+        wp_die( __( 'Invalid post type.' ) );
 
-        if ( ! current_user_can( 'delete_post', $post_id ) )
-                wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+    if ( ! current_user_can( 'delete_post', $post_id ) )
+        wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
 
-        if ( $post->post_type == 'attachment' ) {
-                $force = ( ! MEDIA_TRASH );
-                if ( ! wp_delete_attachment( $post_id, $force ) )
-                        wp_die( __( 'Error in deleting.' ) );
-        } else {
-                if ( ! wp_delete_post( $post_id, true ) )
-                        wp_die( __( 'Error in deleting.' ) );
-        }
+    if ( $post->post_type == 'attachment' ) {
+        $force = ( ! MEDIA_TRASH );
+        if ( ! wp_delete_attachment( $post_id, $force ) )
+            wp_die( __( 'Error in deleting.' ) );
+    } else {
+        if ( ! wp_delete_post( $post_id, true ) )
+            wp_die( __( 'Error in deleting.' ) );
+    }
 
-        wp_redirect( add_query_arg('deleted', 1, $sendback) );
-        exit();
+    wp_redirect( add_query_arg('deleted', 1, $sendback) );
+    exit();
 
 case 'preview':
-        check_admin_referer( 'update-post_' . $post_id );
+    check_admin_referer( 'update-post_' . $post_id );
 
-        $url = post_preview();
+    $url = post_preview();
 
-        wp_redirect($url);
-        exit();
+    wp_redirect($url);
+    exit();
 
 default:
-        /**
-         * Fires for a given custom post action request.
-         *
-         * The dynamic portion of the hook name, `$action`, refers to the custom post action.
-         *
-         * @since 4.6.0
-         *
-         * @param int $post_id Post ID sent with the request.
-         */
-        do_action( "post_action_{$action}", $post_id );
-
-        wp_redirect( admin_url('edit.php') );
-        exit();
+    /**
+     * Fires for a given custom post action request.
+     *
+     * The dynamic portion of the hook name, `$action`, refers to the custom post action.
+     *
+     * @since 4.6.0
+     *
+     * @param int $post_id Post ID sent with the request.
+     */
+    do_action( "post_action_{$action}", $post_id );
+
+    wp_redirect( admin_url('edit.php') );
+    exit();
 } // end switch
 include( ABSPATH . 'wp-admin/admin-footer.php' );

src/wp-admin/revision.php

@@ -20 +20 @@
 
 require ABSPATH . 'wp-admin/includes/revision.php';
 
-wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
+$revision = wp_assign_request_var('revision');
+$action = wp_assign_request_var('action');
+$from = wp_assign_request_var('from');
+$to = wp_assign_request_var('to');
 
 $revision_id = absint( $revision );
 
 $from = is_numeric( $from ) ? absint( $from ) : null;
 if ( ! $revision_id )
-        $revision_id = absint( $to );
+    $revision_id = absint( $to );
 $redirect = 'edit.php';
 
 switch ( $action ) {
 case 'restore' :
-        if ( ! $revision = wp_get_post_revision( $revision_id ) )
-                break;
+    if ( ! $revision = wp_get_post_revision( $revision_id ) )
+        break;
 
-        if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-                break;
+    if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+        break;
 
-        if ( ! $post = get_post( $revision->post_parent ) )
-                break;
+    if ( ! $post = get_post( $revision->post_parent ) )
+        break;
 
-        // Restore if revisions are enabled or this is an autosave.
-        if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-                $redirect = 'edit.php?post_type=' . $post->post_type;
-                break;
-        }
+    // Restore if revisions are enabled or this is an autosave.
+    if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+        $redirect = 'edit.php?post_type=' . $post->post_type;
+        break;
+    }
 
-        // Don't allow revision restore when post is locked
-        if ( wp_check_post_lock( $post->ID ) )
-                break;
+    // Don't allow revision restore when post is locked
+    if ( wp_check_post_lock( $post->ID ) )
+        break;
 
-        check_admin_referer( "restore-post_{$revision->ID}" );
+    check_admin_referer( "restore-post_{$revision->ID}" );
 
-        wp_restore_post_revision( $revision->ID );
-        $redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-        break;
+    wp_restore_post_revision( $revision->ID );
+    $redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
+    break;
 case 'view' :
 case 'edit' :
 default :
-        if ( ! $revision = wp_get_post_revision( $revision_id ) )
-                break;
-        if ( ! $post = get_post( $revision->post_parent ) )
-                break;
-
-        if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
-                break;
-
-        // Revisions disabled and we're not looking at an autosave
-        if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-                $redirect = 'edit.php?post_type=' . $post->post_type;
-                break;
-        }
-
-        $post_edit_link = get_edit_post_link();
-        $post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-        /* translators: 1: Post title */
-        $h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-        $return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-        $title          = __( 'Revisions' );
-
-        $redirect = false;
-        break;
+    if ( ! $revision = wp_get_post_revision( $revision_id ) )
+        break;
+    if ( ! $post = get_post( $revision->post_parent ) )
+        break;
+
+    if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
+        break;
+
+    // Revisions disabled and we're not looking at an autosave
+    if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+        $redirect = 'edit.php?post_type=' . $post->post_type;
+        break;
+    }
+
+    $post_edit_link = get_edit_post_link();
+    $post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+    /* translators: 1: Post title */
+    $h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+    $return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
+    $title          = __( 'Revisions' );
+
+    $redirect = false;
+    break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
 if ( ! $redirect && empty( $post->post_type ) )
-        $redirect = 'edit.php';
+    $redirect = 'edit.php';
 
 if ( ! empty( $redirect ) ) {
-        wp_redirect( $redirect );
-        exit;
+    wp_redirect( $redirect );
+    exit;
 }
 
 // This is so that the correct "Edit" menu item is selected.
 if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
-        $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
+    $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
 else
-        $parent_file = $submenu_file = 'edit.php';
+    $parent_file = $submenu_file = 'edit.php';
 
 wp_enqueue_script( 'revisions' );
 wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
@@ -111 +114 @@
 $revisions_overview .= '<li>' . __( 'To restore a revision, <strong>click Restore This Revision</strong>.' ) . '</li></ul>';
 
 get_current_screen()->add_help_tab( array(
-        'id'      => 'revisions-overview',
-        'title'   => __( 'Overview' ),
-        'content' => $revisions_overview
+    'id'      => 'revisions-overview',
+    'title'   => __( 'Overview' ),
+    'content' => $revisions_overview
 ) );
 
 $revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
@@ -127 +130 @@
 ?>
 
 <div class="wrap">
-        <h1 class="long-header"><?php echo $h1; ?></h1>
-        <?php echo $return_to_post; ?>
+    <h1 class="long-header"><?php echo $h1; ?></h1>
+    <?php echo $return_to_post; ?>
 </div>
 <?php
 wp_print_revision_templates();

src/wp-admin/theme-editor.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( is_multisite() && ! is_network_admin() ) {
-        wp_redirect( network_admin_url( 'theme-editor.php' ) );
-        exit();
+    wp_redirect( network_admin_url( 'theme-editor.php' ) );
+    exit();
 }
 
 if ( !current_user_can('edit_themes') )
-        wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
+    wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
@@ -24 +24 @@
 'id'            => 'overview',
 'title'         => __('Overview'),
 'content'       =>
-        '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
-        <p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>
-        <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
-        <p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
-        <p>' . __('After typing in your edits, click Update File.') . '</p>
-        <p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>
-        <p>' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '</p>' .
-        ( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
+    '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
+    <p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>
+    <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.') . '</p>
+    <p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
+    <p>' . __('After typing in your edits, click Update File.') . '</p>
+    <p>' . __('<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.') . '</p>
+    <p>' . sprintf( __('Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.'), __('https://codex.wordpress.org/Child_Themes') ) . '</p>' .
+    ( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
 ) );
 
 get_current_screen()->set_help_sidebar(
-        '<p><strong>' . __('For more information:') . '</strong></p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>') . '</p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>') . '</p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>') . '</p>' .
-        '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+    '<p><strong>' . __('For more information:') . '</strong></p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>') . '</p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>') . '</p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>') . '</p>' .
+    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
-wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
+$action = wp_assign_request_var('action');
+$error = wp_assign_request_var('error');
+$file = wp_assign_request_var('file');
+$theme = wp_assign_request_var('theme');
 
 if ( $theme ) {
-        $stylesheet = $theme;
+    $stylesheet = $theme;
 } else {
-        $stylesheet = get_stylesheet();
+    $stylesheet = get_stylesheet();
 }
 
 $theme = wp_get_theme( $stylesheet );
 
 if ( ! $theme->exists() ) {
-        wp_die( __( 'The requested theme does not exist.' ) );
+    wp_die( __( 'The requested theme does not exist.' ) );
 }
 
 if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) {
-        wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
+    wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
 }
 
 $allowed_files = $style_files = array();
@@ -79 +82 @@
 $file_types = array_unique( array_merge( $file_types, $default_types ) );
 
 foreach ( $file_types as $type ) {
-        switch ( $type ) {
-                case 'php':
-                        $allowed_files += $theme->get_files( 'php', 1 );
-                        $has_templates = ! empty( $allowed_files );
-                        break;
-                case 'css':
-                        $style_files = $theme->get_files( 'css' );
-                        $allowed_files['style.css'] = $style_files['style.css'];
-                        $allowed_files += $style_files;
-                        break;
-                default:
-                        $allowed_files += $theme->get_files( $type );
-                        break;
-        }
+    switch ( $type ) {
+        case 'php':
+            $allowed_files += $theme->get_files( 'php', 1 );
+            $has_templates = ! empty( $allowed_files );
+            break;
+        case 'css':
+            $style_files = $theme->get_files( 'css' );
+            $allowed_files['style.css'] = $style_files['style.css'];
+            $allowed_files += $style_files;
+            break;
+        default:
+            $allowed_files += $theme->get_files( $type );
+            break;
+    }
 }
 
 if ( empty( $file ) ) {
-        $relative_file = 'style.css';
-        $file = $allowed_files['style.css'];
+    $relative_file = 'style.css';
+    $file = $allowed_files['style.css'];
 } else {
-        $relative_file = $file;
-        $file = $theme->get_stylesheet_directory() . '/' . $relative_file;
+    $relative_file = $file;
+    $file = $theme->get_stylesheet_directory() . '/' . $relative_file;
 }
 
 validate_file_to_edit( $file, $allowed_files );
@@ -108 +111 @@
 
 switch( $action ) {
 case 'update':
-        check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-        $newcontent = wp_unslash( $_POST['newcontent'] );
-        $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-        if ( is_writeable( $file ) ) {
-                // is_writable() not always reliable, check return value. see comments @ https://secure.php.net/is_writable
-                $f = fopen( $file, 'w+' );
-                if ( $f !== false ) {
-                        fwrite( $f, $newcontent );
-                        fclose( $f );
-                        $location .= '&updated=true';
-                        $theme->cache_delete();
-                }
-        }
-        wp_redirect( $location );
-        exit;
+    check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+    $newcontent = wp_unslash( $_POST['newcontent'] );
+    $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
+    if ( is_writeable( $file ) ) {
+        // is_writable() not always reliable, check return value. see comments @ https://secure.php.net/is_writable
+        $f = fopen( $file, 'w+' );
+        if ( $f !== false ) {
+            fwrite( $f, $newcontent );
+            fclose( $f );
+            $location .= '&updated=true';
+            $theme->cache_delete();
+        }
+    }
+    wp_redirect( $location );
+    exit;
 
 default:
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-        update_recently_edited( $file );
+    update_recently_edited( $file );
 
-        if ( ! is_file( $file ) )
-                $error = true;
+    if ( ! is_file( $file ) )
+        $error = true;
 
-        $content = '';
-        if ( ! $error && filesize( $file ) > 0 ) {
-                $f = fopen($file, 'r');
-                $content = fread($f, filesize($file));
+    $content = '';
+    if ( ! $error && filesize( $file ) > 0 ) {
+        $f = fopen($file, 'r');
+        $content = fread($f, filesize($file));
 
-                if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-                        $functions = wp_doc_link_parse( $content );
+        if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
+            $functions = wp_doc_link_parse( $content );
 
-                        $docs_select = '<select name="docs-list" id="docs-list">';
-                        $docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
-                        foreach ( $functions as $function ) {
-                                $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
-                        }
-                        $docs_select .= '</select>';
-                }
+            $docs_select = '<select name="docs-list" id="docs-list">';
+            $docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
+            foreach ( $functions as $function ) {
+                $docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+            }
+            $docs_select .= '</select>';
+        }
 
-                $content = esc_textarea( $content );
-        }
+        $content = esc_textarea( $content );
+    }
 
-        if ( isset( $_GET['updated'] ) ) : ?>
+    if ( isset( $_GET['updated'] ) ) : ?>
  <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
 <?php endif;
 
 $description = get_file_description( $relative_file );
 $file_show = array_search( $file, array_filter( $allowed_files ) );
 if ( $description != $file_show )
-        $description .= ' <span>(' . $file_show . ')</span>';
+    $description .= ' <span>(' . $file_show . ')</span>';
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
@@ -169 +172 @@
 <h2><?php echo $theme->display( 'Name' ); if ( $description ) echo ': ' . $description; ?></h2>
 </div>
 <div class="alignright">
-        <form action="theme-editor.php" method="post">
-                <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
-                <select name="theme" id="theme">
+    <form action="theme-editor.php" method="post">
+        <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
+        <select name="theme" id="theme">
 <?php
 foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-        if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
-                continue;
+    if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+        continue;
 
-        $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-        echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+    $selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+    echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
 }
 ?>
-                </select>
-                <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
-        </form>
+        </select>
+        <?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
+    </form>
 </div>
 <br class="clear" />
 </div>
 <?php
 if ( $theme->errors() )
-        echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+    echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
 ?>
-        <div id="templateside">
+    <div id="templateside">
 <?php
 if ( $allowed_files ) :
-        $previous_file_type = '';
-
-        foreach ( $allowed_files as $filename => $absolute_filename ) :
-                $file_type = substr( $filename, strrpos( $filename, '.' ) );
-
-                if ( $file_type !== $previous_file_type ) {
-                        if ( '' !== $previous_file_type ) {
-                                echo "\t</ul>\n";
-                        }
-
-                        switch ( $file_type ) {
-                                case '.php':
-                                        if ( $has_templates || $theme->parent() ) :
-                                                echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
-                                                if ( $theme->parent() ) {
-                                                        echo '<p class="howto">' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
-                                                                sprintf( '<a href="%s">%s</a>',
-                                                                        self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
-                                                                        $theme->parent()->display( 'Name' )
-                                                                )
-                                                        ) . "</p>\n";
-                                                }
-                                        endif;
-                                        break;
-                                case '.css':
-                                        echo "\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n";
-                                        break;
-                                default:
-                                        /* translators: %s: file extension */
-                                        echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
-                                        break;
-                        }
-
-                        echo "\t<ul>\n";
-                }
-
-                $file_description = get_file_description( $filename );
-                if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
-                        $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
-                }
-
-                if ( $absolute_filename === $file ) {
-                        $file_description = '<span class="highlight">' . $file_description . '</span>';
-                }
-
-                $previous_file_type = $file_type;
+    $previous_file_type = '';
+
+    foreach ( $allowed_files as $filename => $absolute_filename ) :
+        $file_type = substr( $filename, strrpos( $filename, '.' ) );
+
+        if ( $file_type !== $previous_file_type ) {
+            if ( '' !== $previous_file_type ) {
+                echo "\t</ul>\n";
+            }
+
+            switch ( $file_type ) {
+                case '.php':
+                    if ( $has_templates || $theme->parent() ) :
+                        echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
+                        if ( $theme->parent() ) {
+                            echo '<p class="howto">' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
+                                sprintf( '<a href="%s">%s</a>',
+                                    self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
+                                    $theme->parent()->display( 'Name' )
+                                )
+                            ) . "</p>\n";
+                        }
+                    endif;
+                    break;
+                case '.css':
+                    echo "\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n";
+                    break;
+                default:
+                    /* translators: %s: file extension */
+                    echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
+                    break;
+            }
+
+            echo "\t<ul>\n";
+        }
+
+        $file_description = get_file_description( $filename );
+        if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
+            $file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+        }
+
+        if ( $absolute_filename === $file ) {
+            $file_description = '<span class="highlight">' . $file_description . '</span>';
+        }
+
+        $previous_file_type = $file_type;
 ?>
-                <li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
+        <li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
 <?php
-        endforeach;
+    endforeach;
 ?>
 </ul>
 <?php endif; ?>
 </div>
 <?php if ( $error ) :
-        echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
+    echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
 else : ?>
-        <form name="template" id="template" action="theme-editor.php" method="post">
-        <?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
-                <div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
-                <input type="hidden" name="action" value="update" />
-                <input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
-                <input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
-                <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
-                </div>
-        <?php if ( ! empty( $functions ) ) : ?>
-                <div id="documentation" class="hide-if-no-js">
-                <label for="docs-list"><?php _e('Documentation:') ?></label>
-                <?php echo $docs_select; ?>
-                <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
-                </div>
-        <?php endif; ?>
-
-                <div>
-                <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
-                        <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-                        <?php _e( 'This is a file in your current parent theme.' ); ?></p>
-                <?php endif; ?>
+    <form name="template" id="template" action="theme-editor.php" method="post">
+    <?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+        <div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
+        <input type="hidden" name="action" value="update" />
+        <input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
+        <input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
+        <input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
+        </div>
+    <?php if ( ! empty( $functions ) ) : ?>
+        <div id="documentation" class="hide-if-no-js">
+        <label for="docs-list"><?php _e('Documentation:') ?></label>
+        <?php echo $docs_select; ?>
+        <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
+        </div>
+    <?php endif; ?>
+
+        <div>
+        <?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
+            <p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+            <?php _e( 'This is a file in your current parent theme.' ); ?></p>
+        <?php endif; ?>
 <?php
-        if ( is_writeable( $file ) ) :
-                submit_button( __( 'Update File' ), 'primary', 'submit', true );
-        else : ?>
+    if ( is_writeable( $file ) ) :
+        submit_button( __( 'Update File' ), 'primary', 'submit', true );
+    else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
-                </div>
-        </form>
+        </div>
+    </form>
 <?php
 endif; // $error
 ?>
@@ -287 +290 @@
 </div>
 <script type="text/javascript">
 jQuery(document).ready(function($){
-        $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
-        $('#newcontent').scrollTop( $('#scrollto').val() );
+    $('#template').submit(function(){ $('#scrollto').val( $('#newcontent').scrollTop() ); });
+    $('#newcontent').scrollTop( $('#scrollto').val() );
 });
 </script>
 <?php

src/wp-admin/theme-install.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 require( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
-wp_reset_vars( array( 'tab' ) );
+$tab = wp_assign_request_var('tab');
 
 if ( ! current_user_can('install_themes') )
-        wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+    wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
 
 if ( is_multisite() && ! is_network_admin() ) {
-        wp_redirect( network_admin_url( 'theme-install.php' ) );
-        exit();
+    wp_redirect( network_admin_url( 'theme-install.php' ) );
+    exit();
 }
 
 $title = __( 'Add Themes' );
 $parent_file = 'themes.php';
 
 if ( ! is_network_admin() ) {
-        $submenu_file = 'themes.php';
+    $submenu_file = 'themes.php';
 }
 
 $installed_themes = search_theme_directories();
 
 if ( false === $installed_themes ) {
-        $installed_themes = array();
+    $installed_themes = array();
 }
 
 foreach ( $installed_themes as $k => $v ) {
-        if ( false !== strpos( $k, '/' ) ) {
-                unset( $installed_themes[ $k ] );
-        }
+    if ( false !== strpos( $k, '/' ) ) {
+        unset( $installed_themes[ $k ] );
+    }
 }
 
 wp_localize_script( 'theme', '_wpThemeSettings', array(
-        'themes'   => false,
-        'settings' => array(
-                'isInstall'  => true,
-                'canInstall' => current_user_can( 'install_themes' ),
-                'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-                'adminUrl'   => parse_url( self_admin_url(), PHP_URL_PATH )
-        ),
-        'l10n' => array(
-                'addNew'              => __( 'Add New Theme' ),
-                'search'              => __( 'Search Themes' ),
-                'searchPlaceholder'   => __( 'Search themes...' ), // placeholder (no ellipsis)
-                'upload'              => __( 'Upload Theme' ),
-                'back'                => __( 'Back' ),
-                'error'               => sprintf(
-                        /* translators: %s: support forums URL */
-                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-                        __( 'https://wordpress.org/support/' )
-                ),
-                'themesFound'         => __( 'Number of Themes found: %d' ),
-                'noThemesFound'       => __( 'No themes found. Try a different search.' ),
-                'collapseSidebar'     => __( 'Collapse Sidebar' ),
-                'expandSidebar'       => __( 'Expand Sidebar' ),
-                /* translators: accessibility text */
-                'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
-        ),
-        'installedThemes' => array_keys( $installed_themes ),
+    'themes'   => false,
+    'settings' => array(
+        'isInstall'  => true,
+        'canInstall' => current_user_can( 'install_themes' ),
+        'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
+        'adminUrl'   => parse_url( self_admin_url(), PHP_URL_PATH )
+    ),
+    'l10n' => array(
+        'addNew'              => __( 'Add New Theme' ),
+        'search'              => __( 'Search Themes' ),
+        'searchPlaceholder'   => __( 'Search themes...' ), // placeholder (no ellipsis)
+        'upload'              => __( 'Upload Theme' ),
+        'back'                => __( 'Back' ),
+        'error'               => sprintf(
+            /* translators: %s: support forums URL */
+            __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+            __( 'https://wordpress.org/support/' )
+        ),
+        'themesFound'         => __( 'Number of Themes found: %d' ),
+        'noThemesFound'       => __( 'No themes found. Try a different search.' ),
+        'collapseSidebar'     => __( 'Collapse Sidebar' ),
+        'expandSidebar'       => __( 'Expand Sidebar' ),
+        /* translators: accessibility text */
+        'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
+    ),
+    'installedThemes' => array_keys( $installed_themes ),
 ) );
 
 wp_enqueue_script( 'theme' );
 wp_enqueue_script( 'updates' );
 
 if ( $tab ) {
-        /**
-         * Fires before each of the tabs are rendered on the Install Themes page.
-         *
-         * The dynamic portion of the hook name, `$tab`, refers to the current
-         * theme install tab. Possible values are 'dashboard', 'search', 'upload',
-         * 'featured', 'new', or 'updated'.
-         *
-         * @since 2.8.0
-         */
-        do_action( "install_themes_pre_{$tab}" );
+    /**
+     * Fires before each of the tabs are rendered on the Install Themes page.
+     *
+     * The dynamic portion of the hook name, `$tab`, refers to the current
+     * theme install tab. Possible values are 'dashboard', 'search', 'upload',
+     * 'featured', 'new', or 'updated'.
+     *
+     * @since 2.8.0
+     */
+    do_action( "install_themes_pre_{$tab}" );
 }
 
 $help_overview =
-        '<p>' . sprintf(
-                        /* translators: %s: Theme Directory URL */
-                        __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
-                        __( 'https://wordpress.org/themes/' )
-                ) . '</p>' .
-        '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-        '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
-        '<p>' . sprintf(
-                        /* translators: %s: /wp-content/themes */
-                        __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
-                        '<code>/wp-content/themes</code>'
-                ) . '</p>';
+    '<p>' . sprintf(
+            /* translators: %s: Theme Directory URL */
+            __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
+            __( 'https://wordpress.org/themes/' )
+        ) . '</p>' .
+    '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
+    '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
+    '<p>' . sprintf(
+            /* translators: %s: /wp-content/themes */
+            __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
+            '<code>/wp-content/themes</code>'
+        ) . '</p>';
 
 get_current_screen()->add_help_tab( array(
-        'id'      => 'overview',
-        'title'   => __('Overview'),
-        'content' => $help_overview
+    'id'      => 'overview',
+    'title'   => __('Overview'),
+    'content' => $help_overview
 ) );
 
 $help_installing =
-        '<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
-        '<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
+    '<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
+    '<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
-        'id'      => 'installing',
-        'title'   => __('Previewing and Installing'),
-        'content' => $help_installing
+    'id'      => 'installing',
+    'title'   => __('Previewing and Installing'),
+    'content' => $help_installing
 ) );
 
 get_current_screen()->set_help_sidebar(
-        '<p><strong>' . __('For more information:') . '</strong></p>' .
-        '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Adding New Themes</a>') . '</p>' .
-        '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+    '<p><strong>' . __('For more information:') . '</strong></p>' .
+    '<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Adding New Themes</a>') . '</p>' .
+    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 include(ABSPATH . 'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
-        <h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
-
-        <?php
-
-        /**
-         * Filters the tabs shown on the Add Themes screen.
-         *
-         * This filter is for backward compatibility only, for the suppression of the upload tab.
-         *
-         * @since 2.8.0
-         *
-         * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
-         */
-        $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
-        if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
-                echo ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">' . __( 'Upload Theme' ) . '</button>';
-        }
-        ?>
-
-        <hr class="wp-header-end">
-
-        <div class="error hide-if-js">
-                <p><?php _e( 'The Theme Installer screen requires JavaScript.' ); ?></p>
-        </div>
-
-        <div class="upload-theme">
-        <?php install_themes_upload(); ?>
-        </div>
-
-        <h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Filter themes list' ); ?></h2>
-
-        <div class="wp-filter hide-if-no-js">
-                <div class="filter-count">
-                        <span class="count theme-count"></span>
-                </div>
-
-                <ul class="filter-links">
-                        <li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
-                        <li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
-                        <li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
-                        <li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
-                </ul>
-
-                <button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e( 'Feature Filter' ); ?></button>
-
-                <form class="search-form"></form>
-
-                <div class="favorites-form">
-                        <?php
-                        $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' );
-                        }
-                        ?>
-                        <p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
-
-                        <p>
-                                <label for="wporg-username-input"><?php _e( 'Your WordPress.org username:' ); ?></label>
-                                <input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
-                                <input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
-                                <input type="button" class="button favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
-                        </p>
-                </div>
-
-                <div class="filter-drawer">
-                        <div class="buttons">
-                                <button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
-                                <button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
-                        </div>
-                <?php
-                $feature_list = get_theme_feature_list();
-                foreach ( $feature_list as $feature_name => $features ) {
-                        echo '<fieldset class="filter-group">';
-                        $feature_name = esc_html( $feature_name );
-                        echo '<legend>' . $feature_name . '</legend>';
-                        echo '<div class="filter-group-feature">';
-                        foreach ( $features as $feature => $feature_name ) {
-                                $feature = esc_attr( $feature );
-                                echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-                                echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
-                        }
-                        echo '</div>';
-                        echo '</fieldset>';
-                }
-                ?>
-                        <div class="buttons">
-                                <button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
-                                <button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
-                        </div>
-                        <div class="filtered-by">
-                                <span><?php _e( 'Filtering by:' ); ?></span>
-                                <div class="tags"></div>
-                                <button type="button" class="button-link edit-filters"><?php _e( 'Edit Filters' ); ?></button>
-                        </div>
-                </div>
-        </div>
-        <h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Themes list' ); ?></h2>
-        <div class="theme-browser content-filterable"></div>
-        <div class="theme-install-overlay wp-full-overlay expanded"></div>
-
-        <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
-        <span class="spinner"></span>
+    <h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+
+    <?php
+
+    /**
+     * Filters the tabs shown on the Add Themes screen.
+     *
+     * This filter is for backward compatibility only, for the suppression of the upload tab.
+     *
+     * @since 2.8.0
+     *
+     * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
+     */
+    $tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
+    if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
+        echo ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">' . __( 'Upload Theme' ) . '</button>';
+    }
+    ?>
+
+    <hr class="wp-header-end">
+
+    <div class="error hide-if-js">
+        <p><?php _e( 'The Theme Installer screen requires JavaScript.' ); ?></p>
+    </div>
+
+    <div class="upload-theme">
+    <?php install_themes_upload(); ?>
+    </div>
+
+    <h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Filter themes list' ); ?></h2>
+
+    <div class="wp-filter hide-if-no-js">
+        <div class="filter-count">
+            <span class="count theme-count"></span>
+        </div>
+
+        <ul class="filter-links">
+            <li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
+            <li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
+            <li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
+            <li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
+        </ul>
+
+        <button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e( 'Feature Filter' ); ?></button>
+
+        <form class="search-form"></form>
+
+        <div class="favorites-form">
+            <?php
+            $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' );
+            }
+            ?>
+            <p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
+
+            <p>
+                <label for="wporg-username-input"><?php _e( 'Your WordPress.org username:' ); ?></label>
+                <input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
+                <input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
+                <input type="button" class="button favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+            </p>
+        </div>
+
+        <div class="filter-drawer">
+            <div class="buttons">
+                <button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
+                <button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
+            </div>
+        <?php
+        $feature_list = get_theme_feature_list();
+        foreach ( $feature_list as $feature_name => $features ) {
+            echo '<fieldset class="filter-group">';
+            $feature_name = esc_html( $feature_name );
+            echo '<legend>' . $feature_name . '</legend>';
+            echo '<div class="filter-group-feature">';
+            foreach ( $features as $feature => $feature_name ) {
+                $feature = esc_attr( $feature );
+                echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
+                echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
+            }
+            echo '</div>';
+            echo '</fieldset>';
+        }
+        ?>
+            <div class="buttons">
+                <button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
+                <button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
+            </div>
+            <div class="filtered-by">
+                <span><?php _e( 'Filtering by:' ); ?></span>
+                <div class="tags"></div>
+                <button type="button" class="button-link edit-filters"><?php _e( 'Edit Filters' ); ?></button>
+            </div>
+        </div>
+    </div>
+    <h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Themes list' ); ?></h2>
+    <div class="theme-browser content-filterable"></div>
+    <div class="theme-install-overlay wp-full-overlay expanded"></div>
+
+    <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+    <span class="spinner"></span>
 
 <?php
 if ( $tab ) {
-        /**
-         * Fires at the top of each of the tabs on the Install Themes page.
-         *
-         * The dynamic portion of the hook name, `$tab`, refers to the current
-         * theme install tab. Possible values are 'dashboard', 'search', 'upload',
-         * 'featured', 'new', or 'updated'.
-         *
-         * @since 2.8.0
-         *
-         * @param int $paged Number of the current page of results being viewed.
-         */
-        do_action( "install_themes_{$tab}", $paged );
+    /**
+     * Fires at the top of each of the tabs on the Install Themes page.
+     *
+     * The dynamic portion of the hook name, `$tab`, refers to the current
+     * theme install tab. Possible values are 'dashboard', 'search', 'upload',
+     * 'featured', 'new', or 'updated'.
+     *
+     * @since 2.8.0
+     *
+     * @param int $paged Number of the current page of results being viewed.
+     */
+    do_action( "install_themes_{$tab}", $paged );
 }
 ?>
 </div>
 
 <script id="tmpl-theme" type="text/template">
-        <# if ( data.screenshot_url ) { #>
-                <div class="theme-screenshot">
-                        <img src="{{ data.screenshot_url }}" alt="" />
-                </div>
-        <# } else { #>
-                <div class="theme-screenshot blank"></div>
-        <# } #>
-        <span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
-        <div class="theme-author">
-                <?php
-                /* translators: %s: Theme author name */
-                printf( __( 'By %s' ), '{{ data.author }}' );
-                ?>
-        </div>
-        <h3 class="theme-name">{{ data.name }}</h3>
-
-        <div class="theme-actions">
-                <# if ( data.installed ) { #>
-                        <?php
-                        /* translators: %s: Theme name */
-                        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <# if ( data.activate_url ) { #>
-                                <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
-                        <# } #>
-                        <# if ( data.customize_url ) { #>
-                                <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
-                        <# } else { #>
-                                <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
-                        <# } #>
-                <# } else { #>
-                        <?php
-                        /* translators: %s: Theme name */
-                        $aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
-                        <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
-                <# } #>
-        </div>
-
-        <# if ( data.installed ) { #>
-                <div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
-        <# } #>
+    <# if ( data.screenshot_url ) { #>
+        <div class="theme-screenshot">
+            <img src="{{ data.screenshot_url }}" alt="" />
+        </div>
+    <# } else { #>
+        <div class="theme-screenshot blank"></div>
+    <# } #>
+    <span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
+    <div class="theme-author">
+        <?php
+        /* translators: %s: Theme author name */
+        printf( __( 'By %s' ), '{{ data.author }}' );
+        ?>
+    </div>
+    <h3 class="theme-name">{{ data.name }}</h3>
+
+    <div class="theme-actions">
+        <# if ( data.installed ) { #>
+            <?php
+            /* translators: %s: Theme name */
+            $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+            ?>
+            <# if ( data.activate_url ) { #>
+                <a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+            <# } #>
+            <# if ( data.customize_url ) { #>
+                <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+            <# } else { #>
+                <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+            <# } #>
+        <# } else { #>
+            <?php
+            /* translators: %s: Theme name */
+            $aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
+            ?>
+            <a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
+            <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+        <# } #>
+    </div>
+
+    <# if ( data.installed ) { #>
+        <div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
+    <# } #>
 </script>
 
 <script id="tmpl-theme-preview" type="text/template">
-        <div class="wp-full-overlay-sidebar">
-                <div class="wp-full-overlay-header">
-                        <button class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-                        <button class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></button>
-                        <button class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></button>
-                        <# if ( data.installed ) { #>
-                                <a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
-                        <# } else { #>
-                                <a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></a>
-                        <# } #>
-                </div>
-                <div class="wp-full-overlay-sidebar-content">
-                        <div class="install-theme-info">
-                                <h3 class="theme-name">{{ data.name }}</h3>
-                                        <span class="theme-by">
-                                                <?php
-                                                /* translators: %s: Theme author name */
-                                                printf( __( 'By %s' ), '{{ data.author }}' );
-                                                ?>
-                                        </span>
-
-                                        <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
-
-                                        <div class="theme-details">
-                                                <# if ( data.rating ) { #>
-                                                        <div class="theme-rating">
-                                                                {{{ data.stars }}}
-                                                                <span class="num-ratings">({{ data.num_ratings }})</span>
-                                                        </div>
-                                                <# } else { #>
-                                                        <span class="no-rating"><?php _e( 'This theme has not been rated yet.' ); ?></span>
-                                                <# } #>
-                                                <div class="theme-version">
-                                                        <?php
-                                                        /* translators: %s: Theme version */
-                                                        printf( __( 'Version: %s' ), '{{ data.version }}' );
-                                                        ?>
-                                                </div>
-                                                <div class="theme-description">{{{ data.description }}}</div>
-                                        </div>
-                                </div>
-                        </div>
-                        <div class="wp-full-overlay-footer">
-                                <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
-                                        <span class="collapse-sidebar-arrow"></span>
-                                        <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
-                                </button>
-                        </div>
-                </div>
-                <div class="wp-full-overlay-main">
-                <iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>"></iframe>
-        </div>
+    <div class="wp-full-overlay-sidebar">
+        <div class="wp-full-overlay-header">
+            <button class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+            <button class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></button>
+            <button class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></button>
+            <# if ( data.installed ) { #>
+                <a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
+            <# } else { #>
+                <a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></a>
+            <# } #>
+        </div>
+        <div class="wp-full-overlay-sidebar-content">
+            <div class="install-theme-info">
+                <h3 class="theme-name">{{ data.name }}</h3>
+                    <span class="theme-by">
+                        <?php
+                        /* translators: %s: Theme author name */
+                        printf( __( 'By %s' ), '{{ data.author }}' );
+                        ?>
+                    </span>
+
+                    <img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
+
+                    <div class="theme-details">
+                        <# if ( data.rating ) { #>
+                            <div class="theme-rating">
+                                {{{ data.stars }}}
+                                <span class="num-ratings">({{ data.num_ratings }})</span>
+                            </div>
+                        <# } else { #>
+                            <span class="no-rating"><?php _e( 'This theme has not been rated yet.' ); ?></span>
+                        <# } #>
+                        <div class="theme-version">
+                            <?php
+                            /* translators: %s: Theme version */
+                            printf( __( 'Version: %s' ), '{{ data.version }}' );
+                            ?>
+                        </div>
+                        <div class="theme-description">{{{ data.description }}}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="wp-full-overlay-footer">
+                <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+                    <span class="collapse-sidebar-arrow"></span>
+                    <span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+                </button>
+            </div>
+        </div>
+        <div class="wp-full-overlay-main">
+        <iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>"></iframe>
+    </div>
 </script>
 
 <?php

src/wp-admin/themes.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
-        wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
-                403
-        );
+    wp_die(
+        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+        403
+    );
 }
 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
-        if ( 'activate' == $_GET['action'] ) {
-                check_admin_referer('switch-theme_' . $_GET['stylesheet']);
-                $theme = wp_get_theme( $_GET['stylesheet'] );
-
-                if ( ! $theme->exists() || ! $theme->is_allowed() ) {
-                        wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
-                                403
-                        );
-                }
-
-                switch_theme( $theme->get_stylesheet() );
-                wp_redirect( admin_url('themes.php?activated=true') );
-                exit;
-        } elseif ( 'delete' == $_GET['action'] ) {
-                check_admin_referer('delete-theme_' . $_GET['stylesheet']);
-                $theme = wp_get_theme( $_GET['stylesheet'] );
-
-                if ( ! current_user_can( 'delete_themes' ) ) {
-                        wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                                '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
-                                403
-                        );
-                }
-
-                if ( ! $theme->exists() ) {
-                        wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-                                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
-                                403
-                        );
-                }
-
-                $active = wp_get_theme();
-                if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
-                        wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );
-                } else {
-                        delete_theme( $_GET['stylesheet'] );
-                        wp_redirect( admin_url( 'themes.php?deleted=true' ) );
-                }
-                exit;
-        }
+    if ( 'activate' == $_GET['action'] ) {
+        check_admin_referer('switch-theme_' . $_GET['stylesheet']);
+        $theme = wp_get_theme( $_GET['stylesheet'] );
+
+        if ( ! $theme->exists() || ! $theme->is_allowed() ) {
+            wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                403
+            );
+        }
+
+        switch_theme( $theme->get_stylesheet() );
+        wp_redirect( admin_url('themes.php?activated=true') );
+        exit;
+    } elseif ( 'delete' == $_GET['action'] ) {
+        check_admin_referer('delete-theme_' . $_GET['stylesheet']);
+        $theme = wp_get_theme( $_GET['stylesheet'] );
+
+        if ( ! current_user_can( 'delete_themes' ) ) {
+            wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+                403
+            );
+        }
+
+        if ( ! $theme->exists() ) {
+            wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                403
+            );
+        }
+
+        $active = wp_get_theme();
+        if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
+            wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );
+        } else {
+            delete_theme( $_GET['stylesheet'] );
+            wp_redirect( admin_url( 'themes.php?deleted=true' ) );
+        }
+        exit;
+    }
 }
 
 $title = __('Manage Themes');
@@ -69 +69 @@
 
 // Help tab: Overview
 if ( current_user_can( 'switch_themes' ) ) {
-        $help_overview  = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
-                '<p>' . __( 'From this screen you can:' ) . '</p>' .
-                '<ul><li>' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '</li>' .
-                '<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
-                '<li>' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '</li></ul>' .
-                '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
-                '<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';
-
-        get_current_screen()->add_help_tab( array(
-                'id'      => 'overview',
-                'title'   => __( 'Overview' ),
-                'content' => $help_overview
-        ) );
+    $help_overview  = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
+        '<p>' . __( 'From this screen you can:' ) . '</p>' .
+        '<ul><li>' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '</li>' .
+        '<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
+        '<li>' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '</li></ul>' .
+        '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
+        '<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';
+
+    get_current_screen()->add_help_tab( array(
+        'id'      => 'overview',
+        'title'   => __( 'Overview' ),
+        'content' => $help_overview
+    ) );
 } // switch_themes
 
 // Help tab: Adding Themes
 if ( current_user_can( 'install_themes' ) ) {
-        if ( is_multisite() ) {
-                $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
-        } else {
-                $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), __( 'https://wordpress.org/themes/' ) ) . '</p>';
-        }
-
-        get_current_screen()->add_help_tab( array(
-                'id'      => 'adding-themes',
-                'title'   => __('Adding Themes'),
-                'content' => $help_install
-        ) );
+    if ( is_multisite() ) {
+        $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
+    } else {
+        $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), __( 'https://wordpress.org/themes/' ) ) . '</p>';
+    }
+
+    get_current_screen()->add_help_tab( array(
+        'id'      => 'adding-themes',
+        'title'   => __('Adding Themes'),
+        'content' => $help_install
+    ) );
 } // install_themes
 
 // Help tab: Previewing and Customizing
 if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-        $help_customize =
-                '<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
-                '<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.' ) . '</p>' .
-                '<p>' . __( 'When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.' ) . '</p>';
-
-        get_current_screen()->add_help_tab( array(
-                'id'            => 'customize-preview-themes',
-                'title'         => __( 'Previewing and Customizing' ),
-                'content'       => $help_customize
-        ) );
+    $help_customize =
+        '<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
+        '<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.' ) . '</p>' .
+        '<p>' . __( 'When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.' ) . '</p>';
+
+    get_current_screen()->add_help_tab( array(
+        'id'            => 'customize-preview-themes',
+        'title'         => __( 'Previewing and Customizing' ),
+        'content'       => $help_customize
+    ) );
 } // edit_theme_options && customize
 
 get_current_screen()->set_help_sidebar(
-        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-        '<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>' ) . '</p>' .
-        '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+    '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+    '<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>' ) . '</p>' .
+    '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 if ( current_user_can( 'switch_themes' ) ) {
-        $themes = wp_prepare_themes_for_js();
+    $themes = wp_prepare_themes_for_js();
 } else {
-        $themes = wp_prepare_themes_for_js( array( wp_get_theme() ) );
+    $themes = wp_prepare_themes_for_js( array( wp_get_theme() ) );
 }
-wp_reset_vars( array( 'theme', 'search' ) );
+
+$theme = wp_assign_request_var('theme');
+$search = wp_assign_request_var('search');
 
 wp_localize_script( 'theme', '_wpThemeSettings', array(
-        'themes'   => $themes,
-        'settings' => array(
-                'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
-                'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
-                'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
-                'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
-        ),
-        'l10n' => array(
-                'addNew'            => __( 'Add New Theme' ),
-                'search'            => __( 'Search Installed Themes' ),
-                'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
-                'themesFound'       => __( 'Number of Themes found: %d' ),
-                'noThemesFound'     => __( 'No themes found. Try a different search.' ),
-        ),
+    'themes'   => $themes,
+    'settings' => array(
+        'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
+        'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
+        'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
+        'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
+    ),
+     'l10n' => array(
+         'addNew'            => __( 'Add New Theme' ),
+         'search'            => __( 'Search Installed Themes' ),
+         'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+        'themesFound'       => __( 'Number of Themes found: %d' ),
+        'noThemesFound'     => __( 'No themes found. Try a different search.' ),
+      ),
 ) );
 
 add_thickbox();
@@ -152 +154 @@
 ?>
 
 <div class="wrap">
-        <h1 class="wp-heading-inline"><?php esc_html_e( 'Themes' ); ?>
-                <span class="title-count theme-count"><?php echo count( $themes ); ?></span>
-        </h1>
+    <h1 class="wp-heading-inline"><?php esc_html_e( 'Themes' ); ?>
+        <span class="title-count theme-count"><?php echo count( $themes ); ?></span>
+    </h1>
 
-        <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-                <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
-        <?php endif; ?>
+    <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
+        <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
+    <?php endif; ?>
 
-        <form class="search-form"></form>
+    <form class="search-form"></form>
 
-        <hr class="wp-header-end">
+    <hr class="wp-header-end">
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
 <?php elseif ( isset($_GET['activated']) ) :
-                if ( isset( $_GET['previewed'] ) ) { ?>
-                <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
-                <?php } else { ?>
+        if ( isset( $_GET['previewed'] ) ) { ?>
+        <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
+        <?php } else { ?>
 <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
-                }
-        elseif ( isset($_GET['deleted']) ) : ?>
+        }
+    elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
 <?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
-        <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
+    <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
 <?php
 endif;
 
 $ct = wp_get_theme();
 
 if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
-        echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
+    echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
 }
 
 /*
 // Certain error codes are less fatal than others. We can still display theme information in most cases.
 if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
-        && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?>
+    && in_array( $ct->errors()->get_error_code(), array( 'theme_no_parent', 'theme_parent_invalid', 'theme_no_index' ) ) ) ) : ?>
 */
 
-        // Pretend you didn't see this.
-        $current_theme_actions = array();
-        if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
-                foreach ( (array) $submenu['themes.php'] as $item) {
-                        $class = '';
-                        if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )
-                                continue;
-                        // 0 = name, 1 = capability, 2 = file
-                        if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
-                                $class = ' current';
-                        if ( !empty($submenu[$item[2]]) ) {
-                                $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
-                                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-                                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-                                        $current_theme_actions[] = "<a class='button$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-                                else
-                                        $current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-                        } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
-                                $menu_file = $item[2];
-
-                                if ( current_user_can( 'customize' ) ) {
-                                        if ( 'custom-header' === $menu_file ) {
-                                                $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
-                                        } elseif ( 'custom-background' === $menu_file ) {
-                                                $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
-                                        }
-                                }
-
-                                if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
-                                        $menu_file = substr( $menu_file, 0, $pos );
-                                }
-
-                                if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
-                                        $current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";
-                                } else {
-                                        $current_theme_actions[] = "<a class='button$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
-                                }
-                        }
-                }
-        }
+    // Pretend you didn't see this.
+    $current_theme_actions = array();
+    if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
+        foreach ( (array) $submenu['themes.php'] as $item) {
+            $class = '';
+            if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )
+                continue;
+            // 0 = name, 1 = capability, 2 = file
+            if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
+                $class = ' current';
+            if ( !empty($submenu[$item[2]]) ) {
+                $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
+                $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+                if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+                    $current_theme_actions[] = "<a class='button$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+                else
+                    $current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+            } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+                $menu_file = $item[2];
+
+                if ( current_user_can( 'customize' ) ) {
+                    if ( 'custom-header' === $menu_file ) {
+                        $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
+                    } elseif ( 'custom-background' === $menu_file ) {
+                        $current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
+                    }
+                }
+
+                if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+                    $menu_file = substr( $menu_file, 0, $pos );
+                }
+
+                if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
+                    $current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";
+                } else {
+                    $current_theme_actions[] = "<a class='button$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
+                }
+            }
+        }
+    }
 
 ?>
 
 <div class="theme-browser">
-        <div class="themes wp-clearfix">
+    <div class="themes wp-clearfix">
 
 <?php
 /*
@@ -243 +245 @@
  */
 
 foreach ( $themes as $theme ) :
-        $aria_action = esc_attr( $theme['id'] . '-action' );
-        $aria_name   = esc_attr( $theme['id'] . '-name' );
-        ?>
+    $aria_action = esc_attr( $theme['id'] . '-action' );
+    $aria_name   = esc_attr( $theme['id'] . '-name' );
+    ?>
 <div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
-        <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
-                <div class="theme-screenshot">
-                        <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />
-                </div>
-        <?php } else { ?>
-                <div class="theme-screenshot blank"></div>
-        <?php } ?>
-
-        <?php if ( $theme['hasUpdate'] ) : ?>
-                <div class="update-message notice inline notice-warning notice-alt">
-                <?php if ( $theme['hasPackage'] ) : ?>
-                        <p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p>
-                <?php else : ?>
-                        <p><?php _e( 'New version available.' ); ?></p>
-                <?php endif; ?>
-                </div>
-        <?php endif; ?>
-
-        <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
-        <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
-
-        <?php if ( $theme['active'] ) { ?>
-                <h2 class="theme-name" id="<?php echo $aria_name; ?>">
-                        <?php
-                        /* translators: %s: theme name */
-                        printf( __( '<span>Active:</span> %s' ), $theme['name'] );
-                        ?>
-                </h2>
-        <?php } else { ?>
-                <h2 class="theme-name" id="<?php echo $aria_name; ?>"><?php echo $theme['name']; ?></h2>
-        <?php } ?>
-
-        <div class="theme-actions">
-
-        <?php if ( $theme['active'] ) { ?>
-                <?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
-                        <a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
-                <?php } ?>
-        <?php } else { ?>
-                <?php
-                /* translators: %s: Theme name */
-                $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                ?>
-                <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
-                <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
-                        <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
-                <?php } ?>
-        <?php } ?>
-
-        </div>
+    <?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
+        <div class="theme-screenshot">
+            <img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />
+        </div>
+    <?php } else { ?>
+        <div class="theme-screenshot blank"></div>
+    <?php } ?>
+
+    <?php if ( $theme['hasUpdate'] ) : ?>
+        <div class="update-message notice inline notice-warning notice-alt">
+        <?php if ( $theme['hasPackage'] ) : ?>
+            <p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p>
+        <?php else : ?>
+            <p><?php _e( 'New version available.' ); ?></p>
+        <?php endif; ?>
+        </div>
+    <?php endif; ?>
+
+    <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
+    <div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
+
+    <?php if ( $theme['active'] ) { ?>
+        <h2 class="theme-name" id="<?php echo $aria_name; ?>">
+            <?php
+            /* translators: %s: theme name */
+            printf( __( '<span>Active:</span> %s' ), $theme['name'] );
+            ?>
+        </h2>
+    <?php } else { ?>
+        <h2 class="theme-name" id="<?php echo $aria_name; ?>"><?php echo $theme['name']; ?></h2>
+    <?php } ?>
+
+    <div class="theme-actions">
+
+    <?php if ( $theme['active'] ) { ?>
+        <?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+            <a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
+        <?php } ?>
+    <?php } else { ?>
+        <?php
+        /* translators: %s: Theme name */
+        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+        ?>
+        <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+        <?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
+            <a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
+        <?php } ?>
+    <?php } ?>
+
+    </div>
 </div>
 <?php endforeach; ?>
-        </div>
+    </div>
 </div>
 <div class="theme-overlay"></div>
 
@@ -319 +321 @@
 $can_install = current_user_can( 'install_themes' );
 ?>
 <table>
-        <tr>
-                <th><?php _ex('Name', 'theme name'); ?></th>
-                <th><?php _e('Description'); ?></th>
-                <?php if ( $can_delete ) { ?>
-                        <td></td>
-                <?php } ?>
-                <?php if ( $can_install ) { ?>
-                        <td></td>
-                <?php } ?>
-        </tr>
-        <?php foreach ( $broken_themes as $broken_theme ) : ?>
-                <tr>
-                        <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>
-                        <td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
-                        <?php
-                        if ( $can_delete ) {
-                                $stylesheet = $broken_theme->get_stylesheet();
-                                $delete_url = add_query_arg( array(
-                                        'action'     => 'delete',
-                                        'stylesheet' => urlencode( $stylesheet ),
-                                ), admin_url( 'themes.php' ) );
-                                $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
-                                ?>
-                                <td><a href="<?php echo esc_url( $delete_url ); ?>" class="button delete-theme"><?php _e( 'Delete' ); ?></a></td>
-                                <?php
-                        }
-
-                        if ( $can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code() ) {
-                                $parent_theme_name = $broken_theme->get( 'Template' );
-                                $parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
-
-                                if ( ! is_wp_error( $parent_theme ) ) {
-                                        $install_url = add_query_arg( array(
-                                                'action' => 'install-theme',
-                                                'theme'  => urlencode( $parent_theme_name ),
-                                        ), admin_url( 'update.php' ) );
-                                        $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
-                                        ?>
-                                        <td><a href="<?php echo esc_url( $install_url ); ?>" class="button install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
-                                        <?php
-                                }
-                        }
-                        ?>
-                </tr>
-        <?php endforeach; ?>
+    <tr>
+        <th><?php _ex('Name', 'theme name'); ?></th>
+        <th><?php _e('Description'); ?></th>
+        <?php if ( $can_delete ) { ?>
+            <td></td>
+        <?php } ?>
+        <?php if ( $can_install ) { ?>
+            <td></td>
+        <?php } ?>
+    </tr>
+    <?php foreach ( $broken_themes as $broken_theme ) : ?>
+        <tr>
+            <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>
+            <td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
+            <?php
+            if ( $can_delete ) {
+                $stylesheet = $broken_theme->get_stylesheet();
+                $delete_url = add_query_arg( array(
+                    'action'     => 'delete',
+                    'stylesheet' => urlencode( $stylesheet ),
+                ), admin_url( 'themes.php' ) );
+                $delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
+                ?>
+                <td><a href="<?php echo esc_url( $delete_url ); ?>" class="button delete-theme"><?php _e( 'Delete' ); ?></a></td>
+                <?php
+            }
+
+            if ( $can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code() ) {
+                $parent_theme_name = $broken_theme->get( 'Template' );
+                $parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
+
+                if ( ! is_wp_error( $parent_theme ) ) {
+                    $install_url = add_query_arg( array(
+                        'action' => 'install-theme',
+                        'theme'  => urlencode( $parent_theme_name ),
+                    ), admin_url( 'update.php' ) );
+                    $install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
+                    ?>
+                    <td><a href="<?php echo esc_url( $install_url ); ?>" class="button install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
+                    <?php
+                }
+            }
+            ?>
+        </tr>
+    <?php endforeach; ?>
 </table>
 </div>
 
@@ -378 +380 @@
  */
 ?>
 <script id="tmpl-theme" type="text/template">
-        <# if ( data.screenshot[0] ) { #>
-                <div class="theme-screenshot">
-                        <img src="{{ data.screenshot[0] }}" alt="" />
-                </div>
-        <# } else { #>
-                <div class="theme-screenshot blank"></div>
-        <# } #>
-
-        <# if ( data.hasUpdate ) { #>
-                <# if ( data.hasPackage ) { #>
-                        <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p></div>
-                <# } else { #>
-                        <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available.' ); ?></p></div>
-                <# } #>
-        <# } #>
-
-        <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
-        <div class="theme-author">
-                <?php
-                /* translators: %s: Theme author name */
-                printf( __( 'By %s' ), '{{{ data.author }}}' );
-                ?>
-        </div>
-
-        <# if ( data.active ) { #>
-                <h2 class="theme-name" id="{{ data.id }}-name">
-                        <?php
-                        /* translators: %s: Theme name */
-                        printf( __( '<span>Active:</span> %s' ), '{{{ data.name }}}' );
-                        ?>
-                </h2>
-        <# } else { #>
-                <h2 class="theme-name" id="{{ data.id }}-name">{{{ data.name }}}</h2>
-        <# } #>
-
-        <div class="theme-actions">
-                <# if ( data.active ) { #>
-                        <# if ( data.actions.customize ) { #>
-                                <a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
-                        <# } #>
-                <# } else { #>
-                        <?php
-                        /* translators: %s: Theme name */
-                        $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
-                        <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
-                <# } #>
-        </div>
+    <# if ( data.screenshot[0] ) { #>
+        <div class="theme-screenshot">
+            <img src="{{ data.screenshot[0] }}" alt="" />
+        </div>
+    <# } else { #>
+        <div class="theme-screenshot blank"></div>
+    <# } #>
+
+    <# if ( data.hasUpdate ) { #>
+        <# if ( data.hasPackage ) { #>
+            <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available. <button class="button-link" type="button">Update now</button>' ); ?></p></div>
+        <# } else { #>
+            <div class="update-message notice inline notice-warning notice-alt"><p><?php _e( 'New version available.' ); ?></p></div>
+        <# } #>
+    <# } #>
+
+    <span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
+    <div class="theme-author">
+        <?php
+        /* translators: %s: Theme author name */
+        printf( __( 'By %s' ), '{{{ data.author }}}' );
+        ?>
+    </div>
+
+    <# if ( data.active ) { #>
+        <h2 class="theme-name" id="{{ data.id }}-name">
+            <?php
+            /* translators: %s: Theme name */
+            printf( __( '<span>Active:</span> %s' ), '{{{ data.name }}}' );
+            ?>
+        </h2>
+    <# } else { #>
+        <h2 class="theme-name" id="{{ data.id }}-name">{{{ data.name }}}</h2>
+    <# } #>
+
+    <div class="theme-actions">
+        <# if ( data.active ) { #>
+            <# if ( data.actions.customize ) { #>
+                <a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
+            <# } #>
+        <# } else { #>
+            <?php
+            /* translators: %s: Theme name */
+            $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+            ?>
+            <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
+            <a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+        <# } #>
+    </div>
 </script>
 
 <script id="tmpl-theme-single" type="text/template">
-        <div class="theme-backdrop"></div>
-        <div class="theme-wrap wp-clearfix">
-                <div class="theme-header">
-                        <button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-                        <button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-                        <button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
-                </div>
-                <div class="theme-about wp-clearfix">
-                        <div class="theme-screenshots">
-                        <# if ( data.screenshot[0] ) { #>
-                                <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
-                        <# } else { #>
-                                <div class="screenshot blank"></div>
-                        <# } #>
-                        </div>
-
-                        <div class="theme-info">
-                                <# if ( data.active ) { #>
-                                        <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
-                                <# } #>
-                                <h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
-                                <p class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></p>
-
-                                <# if ( data.hasUpdate ) { #>
-                                <div class="notice notice-warning notice-alt notice-large">
-                                        <h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>
-                                        {{{ data.update }}}
-                                </div>
-                                <# } #>
-                                <p class="theme-description">{{{ data.description }}}</p>
-
-                                <# if ( data.parent ) { #>
-                                        <p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
-                                <# } #>
-
-                                <# if ( data.tags ) { #>
-                                        <p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
-                                <# } #>
-                        </div>
-                </div>
-
-                <div class="theme-actions">
-                        <div class="active-theme">
-                                <a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e( 'Customize' ); ?></a>
-                                <?php echo implode( ' ', $current_theme_actions ); ?>
-                        </div>
-                        <div class="inactive-theme">
-                                <?php
-                                /* translators: %s: Theme name */
-                                $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
-                                ?>
-                                <# if ( data.actions.activate ) { #>
-                                        <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
-                                <# } #>
-                                <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
-                        </div>
-
-                        <# if ( ! data.active && data.actions['delete'] ) { #>
-                                <a href="{{{ data.actions['delete'] }}}" class="button delete-theme"><?php _e( 'Delete' ); ?></a>
-                        <# } #>
-                </div>
-        </div>
+    <div class="theme-backdrop"></div>
+    <div class="theme-wrap wp-clearfix">
+        <div class="theme-header">
+            <button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
+            <button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
+            <button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+        </div>
+        <div class="theme-about wp-clearfix">
+            <div class="theme-screenshots">
+            <# if ( data.screenshot[0] ) { #>
+                <div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
+            <# } else { #>
+                <div class="screenshot blank"></div>
+            <# } #>
+            </div>
+
+            <div class="theme-info">
+                <# if ( data.active ) { #>
+                    <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+                <# } #>
+                <h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
+                <p class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></p>
+
+                <# if ( data.hasUpdate ) { #>
+                <div class="notice notice-warning notice-alt notice-large">
+                    <h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>
+                    {{{ data.update }}}
+                </div>
+                <# } #>
+                <p class="theme-description">{{{ data.description }}}</p>
+
+                <# if ( data.parent ) { #>
+                    <p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+                <# } #>
+
+                <# if ( data.tags ) { #>
+                    <p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
+                <# } #>
+            </div>
+        </div>
+
+        <div class="theme-actions">
+            <div class="active-theme">
+                <a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e( 'Customize' ); ?></a>
+                <?php echo implode( ' ', $current_theme_actions ); ?>
+            </div>
+            <div class="inactive-theme">
+                <?php
+                /* translators: %s: Theme name */
+                $aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+                ?>
+                <# if ( data.actions.activate ) { #>
+                    <a href="{{{ data.actions.activate }}}" class="button activate" aria-label="<?php echo $aria_label; ?>"><?php _e( 'Activate' ); ?></a>
+                <# } #>
+                <a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+            </div>
+
+            <# if ( ! data.active && data.actions['delete'] ) { #>
+                <a href="{{{ data.actions['delete'] }}}" class="button delete-theme"><?php _e( 'Delete' ); ?></a>
+            <# } #>
+        </div>
+    </div>
 </script>
 
 <?php
@@ -500 +502 @@
 wp_print_update_row_templates();
 
 wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-        'totals'  => wp_get_update_data(),
+    'totals'  => wp_get_update_data(),
 ) );
 
 require( ABSPATH . 'wp-admin/admin-footer.php' );

src/wp-admin/user-edit.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
+$action = wp_assign_request_var('action');
+$user_id = wp_assign_request_var('user_id');
+$wp_http_referer = wp_assign_request_var('wp_http_referer');
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
 if ( ! defined( 'IS_PROFILE_PAGE' ) )
-        define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+    define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
 
 if ( ! $user_id && IS_PROFILE_PAGE )
-        $user_id = $current_user->ID;
+    $user_id = $current_user->ID;
 elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-        wp_die(__( 'Invalid user ID.' ) );
+    wp_die(__( 'Invalid user ID.' ) );
 elseif ( ! get_userdata( $user_id ) )
-        wp_die( __('Invalid user ID.') );
+    wp_die( __('Invalid user ID.') );
 
 wp_enqueue_script('user-profile');
 
 if ( IS_PROFILE_PAGE ) {
-        $title = __( 'Profile' );
+    $title = __( 'Profile' );
 } else {
-        /* translators: %s: user's display name */
-        $title = __( 'Edit User %s' );
+    /* translators: %s: user's display name */
+    $title = __( 'Edit User %s' );
 }
 
 if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
-        $submenu_file = 'users.php';
+    $submenu_file = 'users.php';
 else
-        $submenu_file = 'profile.php';
+    $submenu_file = 'profile.php';
 
 if ( current_user_can('edit_users') && !is_user_admin() )
-        $parent_file = 'users.php';
+    $parent_file = 'users.php';
 else
-        $parent_file = 'profile.php';
+    $parent_file = 'profile.php';
 
 $profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-        '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
-        '<p>' . __( 'You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.' ) . '</p>' .
-        '<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
-        '<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-        '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-        '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+    '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
+    '<p>' . __( 'You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.' ) . '</p>' .
+    '<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
+    '<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
+    '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
+    '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
 
 get_current_screen()->add_help_tab( array(
-        'id'      => 'overview',
-        'title'   => __('Overview'),
-        'content' => $profile_help,
+    'id'      => 'overview',
+    'title'   => __('Overview'),
+    'content' => $profile_help,
 ) );
 
 get_current_screen()->set_help_sidebar(
@@ -80 +82 @@
  * @param bool $allow Whether to allow editing of any user. Default true.
  */
 if ( is_multisite()
-        && ! current_user_can( 'manage_network_users' )
-        && $user_id != $current_user->ID
-        && ! apply_filters( 'enable_edit_any_user_configuration', true )
+    && ! current_user_can( 'manage_network_users' )
+    && $user_id != $current_user->ID
+    && ! apply_filters( 'enable_edit_any_user_configuration', true )
 ) {
-        wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+    wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
 if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-        $new_email = get_user_meta( $current_user->ID, '_new_email', true );
-        if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
-                $user = new stdClass;
-                $user->ID = $current_user->ID;
-                $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-                if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
-                        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
-                }
-                wp_update_user( $user );
-                delete_user_meta( $current_user->ID, '_new_email' );
-                wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
-                die();
-        } else {
-                wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
-        }
+    $new_email = get_user_meta( $current_user->ID, '_new_email', true );
+    if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
+        $user = new stdClass;
+        $user->ID = $current_user->ID;
+        $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
+        if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
+            $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+        }
+        wp_update_user( $user );
+        delete_user_meta( $current_user->ID, '_new_email' );
+        wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
+        die();
+    } else {
+        wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
+    }
 } elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) {
-        check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
-        delete_user_meta( $current_user->ID, '_new_email' );
-        wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
-        die();
+    check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
+    delete_user_meta( $current_user->ID, '_new_email' );
+    wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+    die();
 }
 
 switch ($action) {
@@ -117 +119 @@
 check_admin_referer('update-user_' . $user_id);
 
 if ( !current_user_can('edit_user', $user_id) )
-        wp_die(__('Sorry, you are not allowed to edit this user.'));
+    wp_die(__('Sorry, you are not allowed to edit this user.'));
 
 if ( IS_PROFILE_PAGE ) {
-        /**
-         * Fires before the page loads on the 'Your Profile' editing screen.
-         *
-         * The action only fires if the current user is editing their own profile.
-         *
-         * @since 2.0.0
-         *
-         * @param int $user_id The user ID.
-         */
-        do_action( 'personal_options_update', $user_id );
+    /**
+     * Fires before the page loads on the 'Your Profile' editing screen.
+     *
+     * The action only fires if the current user is editing their own profile.
+     *
+     * @since 2.0.0
+     *
+     * @param int $user_id The user ID.
+     */
+    do_action( 'personal_options_update', $user_id );
 } else {
-        /**
-         * Fires before the page loads on the 'Edit User' screen.
-         *
-         * @since 2.7.0
-         *
-         * @param int $user_id The user ID.
-         */
-        do_action( 'edit_user_profile_update', $user_id );
+    /**
+     * Fires before the page loads on the 'Edit User' screen.
+     *
+     * @since 2.7.0
+     *
+     * @param int $user_id The user ID.
+     */
+    do_action( 'edit_user_profile_update', $user_id );
 }
 
 // Update the email address in signups, if present.
 if ( is_multisite() ) {
-        $user = get_userdata( $user_id );
+    $user = get_userdata( $user_id );
 
-        if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
-        }
+    if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
+        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+    }
 }
 
 // Update the user.
@@ -155 +157 @@
 
 // Grant or revoke super admin status if requested.
 if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-        empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+    empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
 }
 
 if ( !is_wp_error( $errors ) ) {
-        $redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-        if ( $wp_http_referer )
-                $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
-        wp_redirect($redirect);
-        exit;
+    $redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
+    if ( $wp_http_referer )
+        $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+    wp_redirect($redirect);
+    exit;
 }
 
 default:
 $profileuser = get_user_to_edit($user_id);
 
 if ( !current_user_can('edit_user', $user_id) )
-        wp_die(__('Sorry, you are not allowed to edit this user.'));
+    wp_die(__('Sorry, you are not allowed to edit this user.'));
 
 $title = sprintf( $title, $profileuser->display_name );
 $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
@@ -179 +181 @@
 ?>
 
 <?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
-        <div class="notice notice-info"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
+    <div class="notice notice-info"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
 <?php if ( isset($_GET['updated']) ) : ?>
 <div id="message" class="updated notice is-dismissible">
-        <?php if ( IS_PROFILE_PAGE ) : ?>
-        <p><strong><?php _e('Profile updated.') ?></strong></p>
-        <?php else: ?>
-        <p><strong><?php _e('User updated.') ?></strong></p>
-        <?php endif; ?>
-        <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
-        <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
-        <?php endif; ?>
+    <?php if ( IS_PROFILE_PAGE ) : ?>
+    <p><strong><?php _e('Profile updated.') ?></strong></p>
+    <?php else: ?>
+    <p><strong><?php _e('User updated.') ?></strong></p>
+    <?php endif; ?>
+    <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
+    <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
+    <?php endif; ?>
 </div>
 <?php endif; ?>
 <?php if ( isset( $_GET['error'] ) ) : ?>
 <div class="notice notice-error">
-        <?php if ( 'new-email' == $_GET['error'] ) : ?>
-        <p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
-        <?php endif; ?>
+    <?php if ( 'new-email' == $_GET['error'] ) : ?>
+    <p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
+    <?php endif; ?>
 </div>
 <?php endif; ?>
 <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
@@ -211 +213 @@
 
 <?php
 if ( ! IS_PROFILE_PAGE ) {
-        if ( current_user_can( 'create_users' ) ) { ?>
-                <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-        <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-                <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
-        <?php }
+    if ( current_user_can( 'create_users' ) ) { ?>
+        <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+    <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
+        <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+    <?php }
 }
 ?>
 
 <hr class="wp-header-end">
 
 <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
-        /**
-         * Fires inside the your-profile form tag on the user editing screen.
-         *
-         * @since 3.0.0
-         */
-        do_action( 'user_edit_form_tag' );
+    /**
+     * Fires inside the your-profile form tag on the user editing screen.
+     *
+     * @since 3.0.0
+     */
+    do_action( 'user_edit_form_tag' );
 ?>>
 <?php wp_nonce_field('update-user_' . $user_id) ?>
 <?php if ( $wp_http_referer ) : ?>
-        <input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
+    <input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
 <input type="hidden" name="from" value="profile" />
@@ -242 +244 @@
 
 <table class="form-table">
 <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
-        <tr class="user-rich-editing-wrap">
-                <th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-                <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
-        </tr>
+    <tr class="user-rich-editing-wrap">
+        <th scope="row"><?php _e( 'Visual Editor' ); ?></th>
+        <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+    </tr>
 <?php endif; ?>
 <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php
-        /**
-         * Fires in the 'Admin Color Scheme' section of the user editing screen.
-         *
-         * The section is only enabled if a callback is hooked to the action,
-         * and if there is more than one defined color scheme for the admin.
-         *
-         * @since 3.0.0
-         * @since 3.8.1 Added `$user_id` parameter.
-         *
-         * @param int $user_id The user ID.
-         */
-        do_action( 'admin_color_scheme_picker', $user_id );
+    /**
+     * Fires in the 'Admin Color Scheme' section of the user editing screen.
+     *
+     * The section is only enabled if a callback is hooked to the action,
+     * and if there is more than one defined color scheme for the admin.
+     *
+     * @since 3.0.0
+     * @since 3.8.1 Added `$user_id` parameter.
+     *
+     * @param int $user_id The user ID.
+     */
+    do_action( 'admin_color_scheme_picker', $user_id );
 ?></td>
 </tr>
 <?php
@@ -287 +289 @@
 $languages = get_available_languages();
 if ( $languages ) : ?>
 <tr class="user-language-wrap">
-        <th scope="row">
-                <?php /* translators: The user language selection field label */ ?>
-                <label for="locale"><?php _e( 'Language' ); ?></label>
-        </th>
-        <td>
-                <?php
-                $user_locale = $profileuser->locale;
-
-                if ( 'en_US' === $user_locale ) {
-                        $user_locale = '';
-                } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
-                        $user_locale = 'site-default';
-                }
-
-                wp_dropdown_languages( array(
-                        'name'                        => 'locale',
-                        'id'                          => 'locale',
-                        'selected'                    => $user_locale,
-                        'languages'                   => $languages,
-                        'show_available_translations' => false,
-                        'show_option_site_default'    => true
-                ) );
-                ?>
-        </td>
+    <th scope="row">
+        <?php /* translators: The user language selection field label */ ?>
+        <label for="locale"><?php _e( 'Language' ); ?></label>
+    </th>
+    <td>
+        <?php
+        $user_locale = $profileuser->locale;
+
+        if ( 'en_US' === $user_locale ) {
+            $user_locale = '';
+        } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
+            $user_locale = 'site-default';
+        }
+
+        wp_dropdown_languages( array(
+            'name'                        => 'locale',
+            'id'                          => 'locale',
+            'selected'                    => $user_locale,
+            'languages'                   => $languages,
+            'show_available_translations' => false,
+            'show_option_site_default'    => true
+        ) );
+        ?>
+    </td>
 </tr>
 <?php
 endif;
@@ -329 +331 @@
 
 </table>
 <?php
-        if ( IS_PROFILE_PAGE ) {
-                /**
-                 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
-                 *
-                 * The action only fires if the current user is editing their own profile.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param WP_User $profileuser The current WP_User object.
-                 */
-                do_action( 'profile_personal_options', $profileuser );
-        }
+    if ( IS_PROFILE_PAGE ) {
+        /**
+         * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
+         *
+         * The action only fires if the current user is editing their own profile.
+         *
+         * @since 2.0.0
+         *
+         * @param WP_User $profileuser The current WP_User object.
+         */
+        do_action( 'profile_personal_options', $profileuser );
+    }
 ?>
 
 <h2><?php _e( 'Name' ); ?></h2>
 
 <table class="form-table">
-        <tr class="user-user-login-wrap">
-                <th><label for="user_login"><?php _e('Username'); ?></label></th>
-                <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
-        </tr>
+    <tr class="user-user-login-wrap">
+        <th><label for="user_login"><?php _e('Username'); ?></label></th>
+        <td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
+    </tr>
 
 <?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
@@ -364 +366 @@
 
 // print the 'no role' option. Make it selected if the user has no role yet.
 if ( $user_role )
-        echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
+    echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
 else
-        echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+    echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
@@ -383 +385 @@
 <?php } ?>
 
 <tr class="user-first-name-wrap">
-        <th><label for="first_name"><?php _e('First Name') ?></label></th>
-        <td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
+    <th><label for="first_name"><?php _e('First Name') ?></label></th>
+    <td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-last-name-wrap">
-        <th><label for="last_name"><?php _e('Last Name') ?></label></th>
-        <td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
+    <th><label for="last_name"><?php _e('Last Name') ?></label></th>
+    <td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-nickname-wrap">
-        <th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-        <td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
+    <th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+    <td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-display-name-wrap">
-        <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
-        <td>
-                <select name="display_name" id="display_name">
-                <?php
-                        $public_display = array();
-                        $public_display['display_nickname']  = $profileuser->nickname;
-                        $public_display['display_username']  = $profileuser->user_login;
-
-                        if ( !empty($profileuser->first_name) )
-                                $public_display['display_firstname'] = $profileuser->first_name;
-
-                        if ( !empty($profileuser->last_name) )
-                                $public_display['display_lastname'] = $profileuser->last_name;
-
-                        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-                                $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-                                $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
-                        }
-
-                        if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-                                $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
-
-                        $public_display = array_map( 'trim', $public_display );
-                        $public_display = array_unique( $public_display );
-
-                        foreach ( $public_display as $id => $item ) {
-                ?>
-                        <option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
-                <?php
-                        }
-                ?>
-                </select>
-        </td>
+    <th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
+    <td>
+        <select name="display_name" id="display_name">
+        <?php
+            $public_display = array();
+            $public_display['display_nickname']  = $profileuser->nickname;
+            $public_display['display_username']  = $profileuser->user_login;
+
+            if ( !empty($profileuser->first_name) )
+                $public_display['display_firstname'] = $profileuser->first_name;
+
+            if ( !empty($profileuser->last_name) )
+                $public_display['display_lastname'] = $profileuser->last_name;
+
+            if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
+                $public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
+                $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+            }
+
+            if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
+                $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+
+            $public_display = array_map( 'trim', $public_display );
+            $public_display = array_unique( $public_display );
+
+            foreach ( $public_display as $id => $item ) {
+        ?>
+            <option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+        <?php
+            }
+        ?>
+        </select>
+    </td>
 </tr>
 </table>
 
@@ -438 +440 @@
 
 <table class="form-table">
 <tr class="user-email-wrap">
-        <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-        <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
-        <?php
-        $new_email = get_user_meta( $current_user->ID, '_new_email', true );
-        if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
-        <div class="updated inline">
-        <p><?php
-                printf(
-                        /* translators: %s: new email */
-                        __( 'There is a pending change of your email to %s.' ),
-                        '<code>' . esc_html( $new_email['newemail'] ) . '</code>'
-                );
-                printf(
-                        ' <a href="%1$s">%2$s</a>',
-                        esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
-                        __( 'Cancel' )
-                );
-        ?></p>
-        </div>
-        <?php endif; ?>
-        </td>
+    <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+    <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
+    <?php
+    $new_email = get_user_meta( $current_user->ID, '_new_email', true );
+    if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
+    <div class="updated inline">
+    <p><?php
+        printf(
+            /* translators: %s: new email */
+            __( 'There is a pending change of your email to %s.' ),
+            '<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+        );
+        printf(
+            ' <a href="%1$s">%2$s</a>',
+            esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
+            __( 'Cancel' )
+        );
+    ?></p>
+    </div>
+    <?php endif; ?>
+    </td>
 </tr>
 
 <tr class="user-url-wrap">
-        <th><label for="url"><?php _e('Website') ?></label></th>
-        <td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
+    <th><label for="url"><?php _e('Website') ?></label></th>
+    <td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
 </tr>
 
 <?php
-        foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+    foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
 ?>
 <tr class="user-<?php echo $name; ?>-wrap">
-        <th><label for="<?php echo $name; ?>">
-                <?php
-                /**
-                 * Filters a user contactmethod label.
-                 *
-                 * The dynamic portion of the filter hook, `$name`, refers to
-                 * each of the keys in the contactmethods array.
-                 *
-                 * @since 2.9.0
-                 *
-                 * @param string $desc The translatable label for the contactmethod.
-                 */
-                echo apply_filters( "user_{$name}_label", $desc );
-                ?>
-        </label></th>
-        <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
+    <th><label for="<?php echo $name; ?>">
+        <?php
+        /**
+         * Filters a user contactmethod label.
+         *
+         * The dynamic portion of the filter hook, `$name`, refers to
+         * each of the keys in the contactmethods array.
+         *
+         * @since 2.9.0
+         *
+         * @param string $desc The translatable label for the contactmethod.
+         */
+        echo apply_filters( "user_{$name}_label", $desc );
+        ?>
+    </label></th>
+    <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
 </tr>
 <?php
-        }
+    }
 ?>
 </table>
 
@@ -496 +498 @@
 
 <table class="form-table">
 <tr class="user-description-wrap">
-        <th><label for="description"><?php _e('Biographical Info'); ?></label></th>
-        <td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description; // textarea_escaped ?></textarea>
-        <p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
+    <th><label for="description"><?php _e('Biographical Info'); ?></label></th>
+    <td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description; // textarea_escaped ?></textarea>
+    <p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
 </tr>
 
 <?php if ( get_option( 'show_avatars' ) ) : ?>
 <tr class="user-profile-picture">
-        <th><?php _e( 'Profile Picture' ); ?></th>
-        <td>
-                <?php echo get_avatar( $user_id ); ?>
-                <p class="description"><?php
-                        if ( IS_PROFILE_PAGE ) {
-                                /* translators: %s: Gravatar URL */
-                                $description = sprintf( __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
-                                        __( 'https://en.gravatar.com/' )
-                                );
-                        } else {
-                                $description = '';
-                        }
-
-                        /**
-                         * Filters the user profile picture description displayed under the Gravatar.
-                         *
-                         * @since 4.4.0
-                         * @since 4.7.0 Added the `$profileuser` parameter.
-                         *
-                         * @param string  $description The description that will be printed.
-                         * @param WP_User $profileuser The current WP_User object.
-                         */
-                        echo apply_filters( 'user_profile_picture_description', $description, $profileuser );
-                ?></p>
-        </td>
+    <th><?php _e( 'Profile Picture' ); ?></th>
+    <td>
+        <?php echo get_avatar( $user_id ); ?>
+        <p class="description"><?php
+            if ( IS_PROFILE_PAGE ) {
+                /* translators: %s: Gravatar URL */
+                $description = sprintf( __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
+                    __( 'https://en.gravatar.com/' )
+                );
+            } else {
+                $description = '';
+            }
+
+            /**
+             * Filters the user profile picture description displayed under the Gravatar.
+             *
+             * @since 4.4.0
+             * @since 4.7.0 Added the `$profileuser` parameter.
+             *
+             * @param string  $description The description that will be printed.
+             * @param WP_User $profileuser The current WP_User object.
+             */
+            echo apply_filters( 'user_profile_picture_description', $description, $profileuser );
+        ?></p>
+    </td>
 </tr>
 <?php endif; ?>
 
@@ -549 +551 @@
 <h2><?php _e( 'Account Management' ); ?></h2>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-        <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
-        <td>
-                <input class="hidden" value=" " /><!-- #24364 workaround -->
-                <button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
-                <div class="wp-pwd hide-if-js">
-                        <span class="password-input-wrapper">
-                                <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
-                        </span>
-                        <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
-                                <span class="dashicons dashicons-hidden"></span>
-                                <span class="text"><?php _e( 'Hide' ); ?></span>
-                        </button>
-                        <button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-                                <span class="text"><?php _e( 'Cancel' ); ?></span>
-                        </button>
-                        <div style="display:none" id="pass-strength-result" aria-live="polite"></div>
-                </div>
-        </td>
+    <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+    <td>
+        <input class="hidden" value=" " /><!-- #24364 workaround -->
+        <button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+        <div class="wp-pwd hide-if-js">
+            <span class="password-input-wrapper">
+                <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+            </span>
+            <button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+                <span class="dashicons dashicons-hidden"></span>
+                <span class="text"><?php _e( 'Hide' ); ?></span>
+            </button>
+            <button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
+                <span class="text"><?php _e( 'Cancel' ); ?></span>
+            </button>
+            <div style="display:none" id="pass-strength-result" aria-live="polite"></div>
+        </div>
+    </td>
 </tr>
 <tr class="user-pass2-wrap hide-if-js">
-        <th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
-        <td>
-        <input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
-        <p class="description"><?php _e( 'Type your new password again.' ); ?></p>
-        </td>
+    <th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+    <td>
+    <input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
+    <p class="description"><?php _e( 'Type your new password again.' ); ?></p>
+    </td>
 </tr>
 <tr class="pw-weak">
-        <th><?php _e( 'Confirm Password' ); ?></th>
-        <td>
-                <label>
-                        <input type="checkbox" name="pw_weak" class="pw-checkbox" />
-                        <span id="pw-weak-text-label"><?php _e( 'Confirm use of potentially weak password' ); ?></span>
-                </label>
-        </td>
+    <th><?php _e( 'Confirm Password' ); ?></th>
+    <td>
+        <label>
+            <input type="checkbox" name="pw_weak" class="pw-checkbox" />
+            <span id="pw-weak-text-label"><?php _e( 'Confirm use of potentially weak password' ); ?></span>
+        </label>
+    </td>
 </tr>
 <?php endif; ?>
 
 <?php
 if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
-        <tr class="user-sessions-wrap hide-if-no-js">
-                <th><?php _e( 'Sessions' ); ?></th>
-                <td aria-live="assertive">
-                        <div class="destroy-sessions"><button type="button" disabled class="button"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
-                        <p class="description">
-                                <?php _e( 'You are only logged in at this location.' ); ?>
-                        </p>
-                </td>
-        </tr>
+    <tr class="user-sessions-wrap hide-if-no-js">
+        <th><?php _e( 'Sessions' ); ?></th>
+        <td aria-live="assertive">
+            <div class="destroy-sessions"><button type="button" disabled class="button"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+            <p class="description">
+                <?php _e( 'You are only logged in at this location.' ); ?>
+            </p>
+        </td>
+    </tr>
 <?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
-        <tr class="user-sessions-wrap hide-if-no-js">
-                <th><?php _e( 'Sessions' ); ?></th>
-                <td aria-live="assertive">
-                        <div class="destroy-sessions"><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
-                        <p class="description">
-                                <?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
-                        </p>
-                </td>
-        </tr>
+    <tr class="user-sessions-wrap hide-if-no-js">
+        <th><?php _e( 'Sessions' ); ?></th>
+        <td aria-live="assertive">
+            <div class="destroy-sessions"><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+            <p class="description">
+                <?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
+            </p>
+        </td>
+    </tr>
 <?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
-        <tr class="user-sessions-wrap hide-if-no-js">
-                <th><?php _e( 'Sessions' ); ?></th>
-                <td>
-                        <p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
-                        <p class="description">
-                                <?php
-                                /* translators: 1: User's display name. */
-                                printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
-                                ?>
-                        </p>
-                </td>
-        </tr>
+    <tr class="user-sessions-wrap hide-if-no-js">
+        <th><?php _e( 'Sessions' ); ?></th>
+        <td>
+            <p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
+            <p class="description">
+                <?php
+                /* translators: 1: User's display name. */
+                printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
+                ?>
+            </p>
+        </td>
+    </tr>
 <?php endif; ?>
 
 </table>
 
 <?php
-        if ( IS_PROFILE_PAGE ) {
-                /**
-                 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
-                 *
-                 * The action only fires if the current user is editing their own profile.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param WP_User $profileuser The current WP_User object.
-                 */
-                do_action( 'show_user_profile', $profileuser );
-        } else {
-                /**
-                 * Fires after the 'About the User' settings table on the 'Edit User' screen.
-                 *
-                 * @since 2.0.0
-                 *
-                 * @param WP_User $profileuser The current WP_User object.
-                 */
-                do_action( 'edit_user_profile', $profileuser );
-        }
+    if ( IS_PROFILE_PAGE ) {
+        /**
+         * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
+         *
+         * The action only fires if the current user is editing their own profile.
+         *
+         * @since 2.0.0
+         *
+         * @param WP_User $profileuser The current WP_User object.
+         */
+        do_action( 'show_user_profile', $profileuser );
+    } else {
+        /**
+         * Fires after the 'About the User' settings table on the 'Edit User' screen.
+         *
+         * @since 2.0.0
+         *
+         * @param WP_User $profileuser The current WP_User object.
+         */
+        do_action( 'edit_user_profile', $profileuser );
+    }
 ?>
 
 <?php
@@ -662 +664 @@
  * @param WP_User $profileuser The current WP_User object.
  */
 if ( count( $profileuser->caps ) > count( $profileuser->roles )
-        && apply_filters( 'additional_capabilities_display', true, $profileuser )
+    && apply_filters( 'additional_capabilities_display', true, $profileuser )
 ) : ?>
 <h2><?php _e( 'Additional Capabilities' ); ?></h2>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
-        <th scope="row"><?php _e( 'Capabilities' ); ?></th>
-        <td>
+    <th scope="row"><?php _e( 'Capabilities' ); ?></th>
+    <td>
 <?php
-        $output = '';
-        foreach ( $profileuser->caps as $cap => $value ) {
-                if ( ! $wp_roles->is_role( $cap ) ) {
-                        if ( '' != $output )
-                                $output .= ', ';
-                        $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
-                }
-        }
-        echo $output;
+    $output = '';
+    foreach ( $profileuser->caps as $cap => $value ) {
+        if ( ! $wp_roles->is_role( $cap ) ) {
+            if ( '' != $output )
+                $output .= ', ';
+            $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+        }
+    }
+    echo $output;
 ?>
-        </td>
+    </td>
 </tr>
 </table>
 <?php endif; ?>
@@ -697 +699 @@
 }
 ?>
 <script type="text/javascript">
-        if (window.location.hash == '#password') {
-                document.getElementById('pass1').focus();
-        }
+    if (window.location.hash == '#password') {
+        document.getElementById('pass1').focus();
+    }
 </script>
 <?php
 include( ABSPATH . 'wp-admin/admin-footer.php');