Ticket #22383: 22383.3.diff

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

@@ -101 +101 @@
                 } 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 == 'domain' ) {
+                        $query .= ' ORDER BY domain ';
+                } elseif ( $order_by == 'path' ) {
+                        $query .= ' ORDER BY path ';
                 } elseif ( $order_by == 'blog_id' ) {
                         $query .= ' ORDER BY blog_id ';
                 } else {
@@ -159 +164 @@
         }
 
         public function get_columns() {
-                $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
                 $sites_columns = array(
                         'cb'          => '<input type="checkbox" />',
-                        'blogname'    => $blogname_columns,
+                        'blogname'    => __( 'URL' ),
+                        'domain'      => __( 'Domain' ),
+                        'path'        => __( 'Path' ),
                         'lastupdated' => __( 'Last Updated' ),
                         'registered'  => _x( 'Registered', 'site' ),
                         'users'       => __( 'Users' )
@@ -187 +193 @@
         protected function get_sortable_columns() {
                 return array(
                         'blogname'    => 'blogname',
+                        'domain'      => 'domain',
+                        'path'        => 'path',
                         'lastupdated' => 'lastupdated',
                         'registered'  => 'blog_id',
                 );
@@ -232 +240 @@
                         }
                         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 ) = $this->get_column_info();
 
@@ -326 +334 @@
                                         <?php
                                         break;
 
-                                        case 'lastupdated':
+                                case 'domain':
                                                 echo "<td class='$column_name column-$column_name'$style>";
+                                                        echo $blog['domain']; ?>
+                                                </td>
+                                        <?php
+                                        break;
+                                case 'path':
+                                                echo "<td class='$column_name column-$column_name'$style>";
+                                                        echo $blog['path']; ?>
+                                                </td>
+                                        <?php
+                                        break;
+                                case 'lastupdated':
+                                                echo "<td class='$column_name column-$column_name'$style>";
                                                         echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] ); ?>
                                                 </td>
                                         <?php