Ticket #18661: 18661.2.diff

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

@@ -200 +200 @@
         public function get_columns() {
                 $sites_columns = array(
                         'cb'          => '<input type="checkbox" />',
+                        'blogname'    => __( 'URL' ),
                         'id'          => __( 'ID' ),
-                        'blogname'    => __( 'URL' ),
                         'lastupdated' => __( 'Last Updated' ),
                         'registered'  => _x( 'Registered', 'site' ),
                         'users'       => __( 'Users' ),

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

@@ -149 +149 @@
         public function get_columns() {
                 $users_columns = array(
                         'cb'         => '<input type="checkbox" />',
+                        'username'   => __( 'Username' ),
                         'id'         => __( 'ID' ),
-                        'username'   => __( 'Username' ),
                         'name'       => __( 'Name' ),
                         'email'      => __( 'Email' ),
                         'registered' => _x( 'Registered', 'user' ),

src/wp-admin/includes/screen.php

@@ -60 +60 @@
         if ( ! $hidden ) {
                 $hidden = array();
 
+                if ( 'sites-network' === $screen->base || 'users-network' === $screen->base ) {
+                        $hidden[] = 'id';
+                }
+
                 /**
                  * Filter the default list of hidden columns.
                  *