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
This commit is contained in:
parent
e90491bdec
commit
2df3d85f4e
|
@ -41,7 +41,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
|
||||||
// to avoid expensive count queries.
|
// to avoid expensive count queries.
|
||||||
if ( !$s && ( get_blog_count() >= 10000 ) ) {
|
if ( !$s && ( get_blog_count() >= 10000 ) ) {
|
||||||
if ( !isset($_REQUEST['orderby']) )
|
if ( !isset($_REQUEST['orderby']) )
|
||||||
$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
|
$_GET['orderby'] = $_REQUEST['orderby'] = '';
|
||||||
if ( !isset($_REQUEST['order']) )
|
if ( !isset($_REQUEST['order']) )
|
||||||
$_GET['order'] = $_REQUEST['order'] = 'DESC';
|
$_GET['order'] = $_REQUEST['order'] = 'DESC';
|
||||||
$large_network = true;
|
$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' ) {
|
if ( $order_by == 'registered' ) {
|
||||||
$query .= ' ORDER BY registered ';
|
$query .= ' ORDER BY registered ';
|
||||||
} elseif ( $order_by == 'lastupdated' ) {
|
} elseif ( $order_by == 'lastupdated' ) {
|
||||||
$query .= ' ORDER BY last_updated ';
|
$query .= ' ORDER BY last_updated ';
|
||||||
} elseif ( $order_by == 'blogname' ) {
|
} elseif ( $order_by == 'blogname' ) {
|
||||||
|
if ( is_subdomain_install() )
|
||||||
$query .= ' ORDER BY domain ';
|
$query .= ' ORDER BY domain ';
|
||||||
|
else
|
||||||
|
$query .= ' ORDER BY path ';
|
||||||
|
} elseif ( $order_by == 'blog_id' ) {
|
||||||
|
$query .= ' ORDER BY blog_id ';
|
||||||
} else {
|
} else {
|
||||||
$order_by = null;
|
$order_by = null;
|
||||||
}
|
}
|
||||||
|
@ -155,7 +160,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
|
||||||
return array(
|
return array(
|
||||||
'blogname' => 'blogname',
|
'blogname' => 'blogname',
|
||||||
'lastupdated' => 'lastupdated',
|
'lastupdated' => 'lastupdated',
|
||||||
'registered' => 'id',
|
'registered' => 'blog_id',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue