Changeset 14563

Timestamp:

05/11/2010 04:50:25 PM (16 years ago)

Author:

ryan

Message:

Don't order term count queries.

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-includes/taxonomy.php

@@ -820 +820 @@
         else if ( 'term_group' == $_orderby )
                 $orderby = 't.term_group';
+        else if ( 'none' == $_orderby )
+                $orderby = '';
         elseif ( empty($_orderby) || 'id' == $_orderby )
                 $orderby = 't.term_id';
 
         $orderby = apply_filters( 'get_terms_orderby', $orderby, $args );
+
+        if ( !empty($orderby) )
+                $orderby = "ORDER BY $orderby";
+        else
+                $order = '';
 
         $where = '';
@@ -917 +924 @@
                         break;
                 case 'count':
+                        $orderby = '';
+                        $order = '';
                         $selects = array('COUNT(*)');
         }
     $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
 
-        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $limit";
+        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit";
 
         if ( 'count' == $fields ) {