Changeset 48424 for trunk/src/wp-admin/includes/class-wp-posts-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-posts-list-table.php (modified) (3 diffs)

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

@@ -136 +136 @@
 
         /**
+         * @global string   $mode             List table view mode.
          * @global array    $avail_post_stati
          * @global WP_Query $wp_query         WordPress Query object.
          * @global int      $per_page
-         * @global string   $mode
          */
         public function prepare_items() {
-                global $avail_post_stati, $wp_query, $per_page, $mode;
+                global $mode, $avail_post_stati, $wp_query, $per_page;
+
+                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' );
+                }
 
                 // Is going to call wp().
@@ -176 +183 @@
                                 }
                         }
-                }
-
-                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' );
                 }
 
@@ -596 +596 @@
 
         /**
+         * @global string $mode List table view mode.
+         *
          * @return array
          */
         protected function get_table_classes() {
-                $mode       = get_user_setting( 'posts_list_mode', 'list' );
-                $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-list';
-                $mode       = get_user_setting( 'posts_list_mode', 'list' );
-                /**
-                 * Filters the current view mode.
-                 *
-                 * @since 5.5.0
-                 *
-                 * @param string $mode The current selected mode. Default value of
-                 *                     posts_list_mode user setting.
-                 */
+                global $mode;
+
+                /** This filter is documented in wp-admin/includes/class-wp-screen.php */
                 $mode = apply_filters( 'table_view_mode', $mode );
 
-                $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-' . $mode;
+                $mode_class = esc_attr( 'table-view-' . $mode );
 
                 return array( 'widefat', 'fixed', 'striped', $mode_class, is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );