Changeset 48424 for trunk/src/wp-admin/includes/class-wp-comments-list-table.php

Timestamp:

07/10/2020 04:02:00 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Administration: Bring some consistency to handling list table view modes.

• Remove duplicate variables and DocBlocks.
• Add missing description for the $mode global.
• Use sentence case for "Compact view" and "Extended view" labels.

Follow-up to [48398], [48423].

Props afercia, Offereins, SergeyBiryukov.
See #49715.

File:

• trunk/src/wp-admin/includes/class-wp-comments-list-table.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -81 +81 @@
          * @global int    $post_id
          * @global string $comment_status
+         * @global string $comment_type
          * @global string $search
-         * @global string $comment_type
          */
         public function prepare_items() {
-                global $post_id, $comment_status, $search, $comment_type;
+                global $post_id, $comment_status, $comment_type, $search;
+
+                if ( ! empty( $_REQUEST['mode'] ) ) {
+                        $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
+                        set_user_setting( 'posts_list_mode', $mode );
+                }
 
                 $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
@@ -123 +128 @@
                 if ( $doing_ajax && isset( $_REQUEST['offset'] ) ) {
                         $start += $_REQUEST['offset'];
-                }
-
-                if ( ! empty( $_REQUEST['mode'] ) ) {
-                        $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
-                        set_user_setting( 'posts_list_mode', $mode );
-                } else {
-                        $mode = get_user_setting( 'posts_list_mode', 'list' );
                 }
 
@@ -760 +758 @@
 
                 $always_visible = false;
-                $mode           = get_user_setting( 'posts_list_mode', 'list' );
+
+                $mode = get_user_setting( 'posts_list_mode', 'list' );
+
                 if ( 'extended' === $mode ) {
                         $always_visible = true;
                 }
 
-                $i    = 0;
                 $out .= '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
+
+                $i = 0;
+
                 foreach ( $actions as $action => $link ) {
                         ++$i;
-                        ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
-
-                        // Reply and quickedit need a hide-if-no-js span when not added with ajax.
+
+                        if ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i )
+                                || 1 === $i
+                        ) {
+                                $sep = '';
+                        } else {
+                                $sep = ' | ';
+                        }
+
+                        // Reply and quickedit need a hide-if-no-js span when not added with Ajax.
                         if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
                                 $action .= ' hide-if-no-js';
-                        } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status ) || ( 'unspam' === $action && 'spam' === $the_comment_status ) ) {
+                        } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status )
+                                || ( 'unspam' === $action && 'spam' === $the_comment_status )
+                        ) {
                                 if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
                                         $action .= ' approve';
@@ -784 +795 @@
                         $out .= "<span class='$action'>$sep$link</span>";
                 }
+
                 $out .= '</div>';