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

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

@@ -25 +25 @@
 
         /**
+         * @global string $mode       List table view mode.
          * @global string $usersearch
          * @global string $role
-         * @global string $mode
          */
         public function prepare_items() {
-                global $usersearch, $role, $mode;
+                global $mode, $usersearch, $role;
+
+                if ( ! empty( $_REQUEST['mode'] ) ) {
+                        $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
+                        set_user_setting( 'network_users_list_mode', $mode );
+                } else {
+                        $mode = get_user_setting( 'network_users_list_mode', 'list' );
+                }
 
                 $usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
@@ -82 +89 @@
                 if ( isset( $_REQUEST['order'] ) ) {
                         $args['order'] = $_REQUEST['order'];
-                }
-
-                if ( ! empty( $_REQUEST['mode'] ) ) {
-                        $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
-                        set_user_setting( 'network_users_list_mode', $mode );
-                } else {
-                        $mode = get_user_setting( 'network_users_list_mode', 'list' );
                 }
 
@@ -423 +423 @@
                         $actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
 
-                        $i            = 0;
                         $action_count = count( $actions );
+
+                        $i = 0;
+
                         foreach ( $actions as $action => $link ) {
                                 ++$i;
-                                $sep = ( $i == $action_count ) ? '' : ' | ';
+
+                                $sep = ( $i < $action_count ) ? ' | ' : '';
+
                                 echo "<span class='$action'>$link$sep</span>";
                         }
+
                         echo '</small></span><br/>';
                 }