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

Timestamp:

07/10/2020 04:02:00 PM (5 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-list-table.php (modified) (5 diffs)

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

@@ -167 +167 @@
         if ( empty( $this->modes ) ) {
             $this->modes = array(
-                'list'     => __( 'Compact View' ),
-                'extended' => __( 'Extended View' ),
+                'list'     => __( 'Compact view' ),
+                'extended' => __( 'Extended view' ),
             );
         }
@@ -518 +518 @@
     protected function row_actions( $actions, $always_visible = false ) {
         $action_count = count( $actions );
-        $i            = 0;
 
         if ( ! $action_count ) {
@@ -525 +524 @@
 
         $mode = get_user_setting( 'posts_list_mode', 'list' );
+
         if ( 'extended' === $mode ) {
             $always_visible = true;
@@ -530 +530 @@
 
         $out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
+
+        $i = 0;
+
         foreach ( $actions as $action => $link ) {
             ++$i;
-            ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-            $out                          .= "<span class='$action'>$link$sep</span>";
-        }
+
+            $sep = ( $i < $action_count ) ? ' | ' : '';
+
+            $out .= "<span class='$action'>$link$sep</span>";
+        }
+
         $out .= '</div>';
 
@@ -1253 +1259 @@
      */
     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.
-         */
+        $mode = get_user_setting( 'posts_list_mode', 'list' );
+
+        /** 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, $this->_args['plural'] );