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

Timestamp:

05/23/2007 07:15:10 AM (18 years ago)

Author:

ryan

Message:

Start moving link categories to taxonomy. see #4189

File:

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

trunk/wp-includes/taxonomy.php

@@ -183 +183 @@
  * @return array The requested term data.            
  */
-function get_object_terms($object_id, $taxonomy) {
+function get_object_terms($object_id, $taxonomy, $args = array()) {
     global $wpdb;
     $taxonomies = ($single_taxonomy = !is_array($taxonomy)) ? array($taxonomy) : $taxonomy;
     $object_ids = ($single_object = !is_array($object_id)) ? array($object_id) : $object_id;
 
+    $defaults = array('orderby' => 'name', 'order' => 'ASC', 'get' => 'everything');
+    $args = wp_parse_args( $args, $defaults );
+    extract($args);
+
+    if ( 'count' == $orderby )
+        $orderby = 'tt.count';
+    else if ( 'name' == $orderby )
+        $orderby = 't.name';
+
     $taxonomies = "'" . implode("', '", $taxonomies) . "'";
     $object_ids = implode(', ', $object_ids);
 
-    if ( $taxonomy_data = $wpdb->get_results("SELECT t.* 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 t.name") ) {
-        if ($single_taxonomy && $single_object) {
-            // Just one kind of taxonomy for one object.
-            return $taxonomy_data;
-        } else {
-            foreach ($taxonomy_data as $data) {
-                if ($single_taxonomy) {
-                    // Many objects, one taxonomy type.
-                    $return[$data->object_id][] = $data;
-                } elseif ($single_object) {
-                    // One object, many taxonomies.
-                    $return[$data->taxonomy][] = $data;
-                } else {
-                    // Many objects, many taxonomies.
-                    $return[$data->object_id][$data->taxonomy][] = $data;
-                }
+    if ( 'everything' == $get )
+        $select_this = 't.*';
+    else if ( 'ids' == $get )
+        $select_this = 't.term_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";
+
+    if ( 'everything' == $get )
+        $taxonomy_data = $wpdb->get_results($query);
+    else if ( 'ids' == $get )
+        $taxonomy_data = $wpdb->get_col($query);
+
+    if ( ! $taxonomy_data )
+        return array();
+
+    if ($single_taxonomy && $single_object) {
+        // Just one kind of taxonomy for one object.
+        return $taxonomy_data;
+    } else {
+        foreach ($taxonomy_data as $data) {
+            if ($single_taxonomy) {
+                // Many objects, one taxonomy type.
+                $return[$data->object_id][] = $data;
+            } elseif ($single_object) {
+                // One object, many taxonomies.
+                $return[$data->taxonomy][] = $data;
+            } else {
+                // Many objects, many taxonomies.
+                $return[$data->object_id][$data->taxonomy][] = $data;
             }
-            return $return;         
-        }
-    } else {
-        return array();
+        }
+        return $return;         
     }
 }
@@ -224 +244 @@
     $defaults = array('orderby' => 'name', 'order' => 'ASC',
         'hide_empty' => true, 'exclude' => '', 'include' => '',
-        'number' => '');
+        'number' => '', 'get' => 'everything');
     $args = wp_parse_args( $args, $defaults );
     $args['number'] = (int) $args['number'];
@@ -279 +299 @@
         $number = '';
 
-    $terms = $wpdb->get_results("SELECT t.*, tt.* 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 $number");
+    if ( 'everything' == $get )
+        $select_this = 't.*, tt.*';
+    else if ( 'ids' == $get )
+        $select_this = 't.term_id';
+
+    $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 $number";
+
+    if ( 'everything' == $get )
+        $terms = $wpdb->get_results($query);
+    else if ( 'ids' == $get )
+        $terms = $wpdb->get_col($query);
 
     if ( empty($terms) )