From 2df3d85f4edc4c6a0f2c7bc4f2a277912b39c34a Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 30 Dec 2010 18:06:33 +0000
Subject: [PATCH] Fix registered and path column sorting. Props garyc40. fixes
 #16034

git-svn-id: http://svn.automattic.com/wordpress/trunk@17180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-sites-list-table.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index 7931d6d09..4f25072f6 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -41,7 +41,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		// to avoid expensive count queries.
 		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';
 			$large_network = true;
@@ -78,13 +78,18 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
+		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
 		if ( $order_by == 'registered' ) {
 			$query .= ' ORDER BY registered ';
 		} elseif ( $order_by == 'lastupdated' ) {
 			$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;
 		}
@@ -155,7 +160,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		return array(
 			'blogname'    => 'blogname',
 			'lastupdated' => 'lastupdated',
-			'registered'  => 'id',
+			'registered'  => 'blog_id',
 		);
 	}