Ticket #32434: 32434.patch

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

@@ -111 +111 @@
                 } elseif ( $order_by == 'lastupdated' ) {
                         $query .= ' ORDER BY last_updated ';
                 } elseif ( $order_by == 'blogname' ) {
-                        if ( is_subdomain_install() )
+                        if ( is_subdomain_install() ) {
                                 $query .= ' ORDER BY domain ';
-                        else
+                        } else {
                                 $query .= ' ORDER BY path ';
+                        }
                 } elseif ( $order_by == 'blog_id' ) {
                         $query .= ' ORDER BY blog_id ';
                 } else {
@@ -182 +183 @@
          * @return array
          */
         public function get_columns() {
-                $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
                 $sites_columns = array(
                         'cb'          => '<input type="checkbox" />',
-                        'blogname'    => $blogname_columns,
+                        'blogname'    => __( 'URL' ),
                         'lastupdated' => __( 'Last Updated' ),
                         'registered'  => _x( 'Registered', 'site' ),
-                        'users'       => __( 'Users' )
                 );
 
-                if ( has_filter( 'wpmublogsaction' ) )
+                if ( has_filter( 'wpmublogsaction' ) ) {
                         $sites_columns['plugins'] = __( 'Actions' );
+                }
 
                 /**
                  * Filter the displayed site columns in Sites list table.
@@ -261 +261 @@
                         }
                         echo "<tr{$class}>";
 
-                        $blogname = ( is_subdomain_install() ) ? str_replace( '.' . get_current_site()->domain, '', $blog['domain'] ) : $blog['path'];
+                        $blogname = $blog['domain'] . $blog['path'];
 
                         list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
@@ -321 +321 @@
                                                         }
                                                 break;
 
-                                                case 'users':
-                                                        $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
-                                                        if ( is_array( $blogusers ) ) {
-                                                                $blogusers_warning = '';
-                                                                if ( count( $blogusers ) > 5 ) {
-                                                                        $blogusers = array_slice( $blogusers, 0, 5 );
-                                                                        $blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'More' ) . '</a>';
-                                                                }
-                                                                foreach ( $blogusers as $user_object ) {
-                                                                        echo '<a href="' . esc_url( network_admin_url( 'user-edit.php?user_id=' . $user_object->ID ) ) . '">' . esc_html( $user_object->user_login ) . '</a> ';
-                                                                        if ( 'list' != $mode )
-                                                                                echo '( ' . $user_object->user_email . ' )';
-                                                                        echo '<br />';
-                                                                }
-                                                                if ( $blogusers_warning != '' )
-                                                                        echo '<strong>' . $blogusers_warning . '</strong><br />';
-                                                        }
-                                                break;
-
                                                 case 'plugins':
                                                         if ( has_filter( 'wpmublogsaction' ) ) {
                                                                 /**