reverting the previous patch: it made it impossible to sort the list by category name
git-svn-id: http://svn.automattic.com/wordpress/trunk@2364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
7431bdd75a
commit
a7110c0663
|
@ -269,11 +269,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
|
|||
}
|
||||
}
|
||||
|
||||
if ($hide_empty) {
|
||||
$categories = array();
|
||||
$extra_fields = 'cat_name, category_nicename, category_description,';
|
||||
} else {
|
||||
if (intval($categories)==0 && !$hide_empty){
|
||||
if (intval($categories)==0){
|
||||
$sort_column = 'cat_'.$sort_column;
|
||||
|
||||
$query = "
|
||||
|
@ -284,12 +280,9 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
|
|||
|
||||
$categories = $wpdb->get_results($query);
|
||||
}
|
||||
$extra_fields = '';
|
||||
}
|
||||
|
||||
if (!count($category_posts)) {
|
||||
$now = current_time('mysql', 1);
|
||||
$cat_counts = $wpdb->get_results(" SELECT cat_ID, $extra_fields
|
||||
$cat_counts = $wpdb->get_results(" SELECT cat_ID,
|
||||
COUNT($wpdb->post2cat.post_id) AS cat_count
|
||||
FROM $wpdb->categories
|
||||
INNER JOIN $wpdb->post2cat ON (cat_ID = category_id)
|
||||
|
@ -301,9 +294,6 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
|
|||
foreach ($cat_counts as $cat_count) {
|
||||
if (1 != intval($hide_empty) || $cat_count > 0) {
|
||||
$category_posts["$cat_count->cat_ID"] = $cat_count->cat_count;
|
||||
if ($hide_empty) {
|
||||
$categories[] = $cat_count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue