Changeset 17180

Timestamp:

12/30/2010 06:06:33 PM (16 years ago)

Author:

ryan

Message:

Fix registered and path column sorting. Props garyc40. fixes #16034

File:

• trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (4 diffs)

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

@@ -42 +42 @@
                 if ( !$s && ( get_blog_count() >= 10000 ) ) {
                         if ( !isset($_REQUEST['orderby']) )
-                                $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
+                                $_GET['orderby'] = $_REQUEST['orderby'] = '';
                         if ( !isset($_REQUEST['order']) )
                                 $_GET['order'] = $_REQUEST['order'] = 'DESC';
@@ -79 +79 @@
                 }
 
-                $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
+                $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
                 if ( $order_by == 'registered' ) {
                         $query .= ' ORDER BY registered ';
@@ -85 +85 @@
                         $query .= ' ORDER BY last_updated ';
                 } elseif ( $order_by == 'blogname' ) {
-                        $query .= ' ORDER BY domain ';
+                        if ( is_subdomain_install() )
+                                $query .= ' ORDER BY domain ';
+                        else
+                                $query .= ' ORDER BY path ';
+                } elseif ( $order_by == 'blog_id' ) {
+                        $query .= ' ORDER BY blog_id ';
                 } else {
                         $order_by = null;
@@ -156 +161 @@
                         'blogname'    => 'blogname',
                         'lastupdated' => 'lastupdated',
-                        'registered'  => 'id',
+                        'registered'  => 'blog_id',
                 );
         }