Changeset 11457 for trunk/wp-includes/taxonomy.php

Timestamp:

05/25/2009 06:18:06 PM (17 years ago)

Author:

ryan

Message:

Add orderby = none option to wp_get_object_terms(). Props vladimir_kolesnikov. fixes #9937

File:

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

trunk/wp-includes/taxonomy.php

@@ -1144 +1144 @@
 
         foreach ( (array) $objects as $object ) {
-                $terms = wp_get_object_terms($object, $taxonomy, 'fields=ids');
+                $terms = wp_get_object_terms($object, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
                 if ( 1 == count($terms) && isset($default) ) {
                         $terms = array($default);
@@ -1247 +1247 @@
         else if ( 'term_order' == $orderby )
                 $orderby = 'tr.term_order';
-        else
+        else if ( 'none' == $orderby ) {
+                $orderby = '';
+                $order = '';
+        } else {
                 $orderby = 't.term_id';
+        }
+
+        if ( !empty($orderby) )
+                $orderby = "ORDER BY $orderby";
 
         $taxonomies = "'" . implode("', '", $taxonomies) . "'";
@@ -1263 +1270 @@
                 $select_this = 't.*, tt.*, tr.object_id';
 
-        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) ORDER BY $orderby $order";
+        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
 
         if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
@@ -1271 +1278 @@
                 $terms = array_merge($terms, $wpdb->get_col($query));
         } else if ( 'tt_ids' == $fields ) {
-                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) ORDER BY tr.term_taxonomy_id $order");
+                if ( !empty($order_by) )
+                        $orderby = "ORDER BY tr.term_taxonomy_id";
+                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
         }
 
@@ -1445 +1454 @@
 
         if ( ! $append )
-                $old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, 'fields=tt_ids');
+                $old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
 
         $tt_ids = array();