Changeset 25161 for trunk/src/wp-includes/taxonomy.php

Timestamp:

08/29/2013 03:18:08 PM (12 years ago)

Author:

wonderboymusic

Message:

Support id=>name and id=>slug values for fields arg in get_terms(). Adds unit tests.

Props mikeschinkel.

Fixes #13661.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1384 +1384 @@
     switch ( $fields ) {
         case 'all':
-            $selects = array('t.*', 'tt.*');
+            $selects = array( 't.*', 'tt.*' );
             break;
         case 'ids':
         case 'id=>parent':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count');
+            $selects = array( 't.term_id', 'tt.parent', 'tt.count' );
             break;
         case 'names':
-            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name');
+            $selects = array( 't.term_id', 'tt.parent', 'tt.count', 't.name' );
             break;
         case 'count':
             $orderby = '';
             $order = '';
-            $selects = array('COUNT(*)');
+            $selects = array( 'COUNT(*)' );
+            break;
+        case 'id=>name':
+            $selects = array( 't.term_id', 't.name' );
+            break;
+        case 'id=>slug':
+            $selects = array( 't.term_id', 't.slug' );
+            break;
     }
 
@@ -1455 +1462 @@
         }
     }
-    reset ( $terms );
+    reset( $terms );
 
     $_terms = array();
     if ( 'id=>parent' == $fields ) {
-        while ( $term = array_shift($terms) )
+        while ( $term = array_shift( $terms ) )
             $_terms[$term->term_id] = $term->parent;
+    } elseif ( 'ids' == $fields ) {
+        while ( $term = array_shift( $terms ) )
+            $_terms[] = $term->term_id;
+    } elseif ( 'names' == $fields ) {
+        while ( $term = array_shift( $terms ) )
+            $_terms[] = $term->name;
+    } elseif ( 'id=>name' == $fields ) {
+        while ( $term = array_shift( $terms ) )
+            $_terms[$term->term_id] = $term->name;
+    } elseif ( 'id=>slug' == $fields ) {
+        while ( $term = array_shift( $terms ) )
+            $_terms[$term->term_id] = $term->slug;
+    }
+
+    if ( ! empty( $_terms ) )
         $terms = $_terms;
-    } elseif ( 'ids' == $fields ) {
-        while ( $term = array_shift($terms) )
-            $_terms[] = $term->term_id;
-        $terms = $_terms;
-    } elseif ( 'names' == $fields ) {
-        while ( $term = array_shift($terms) )
-            $_terms[] = $term->name;
-        $terms = $_terms;
-    }
 
     if ( $number && is_array( $terms ) && count( $terms ) > $number )
@@ -1477 +1490 @@
     wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
 
-    $terms = apply_filters('get_terms', $terms, $taxonomies, $args);
+    $terms = apply_filters( 'get_terms', $terms, $taxonomies, $args );
     return $terms;
 }