Changeset 34998

Timestamp:

10/10/2015 02:12:40 AM (9 years ago)

Author:

boonebgorges

Message:

Return WP_Term objects from get_terms().

Props boonebgorges, flixos90, DrewAPicture.
See #14162.

Location:

trunk

Files:

• src/wp-includes/taxonomy-functions.php (modified) (3 diffs)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy-functions.php

@@ -992 +992 @@
  * @since 4.2.0 Introduced 'name' and 'childless' parameters.
  * @since 4.4.0 Introduced the ability to pass 'term_id' as an alias of 'id' for the `orderby` parameter.
- *              Introduced the 'meta_query' and 'update_term_meta_cache' parameters.
+ *              Introduced the 'meta_query' and 'update_term_meta_cache' parameters. Converted to return
+ *              a list of WP_Term objects.
  *
  * @global wpdb  $wpdb WordPress database abstraction object.
@@ -1053 +1054 @@
  *                                                See `WP_Meta_Query`. Default empty.
  * }
- * @return array|int|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies
- *                        do not exist.
+ * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
+ *                            do not exist.
  */
 function get_terms( $taxonomies, $args = '' ) {
@@ -1494 +1495 @@
             $_terms[ $term->term_id ] = $term->slug;
         }
+    } else {
+        $_terms = array_map( 'get_term', $terms );
     }
 

trunk/tests/phpunit/tests/term/getTerms.php

@@ -1573 +1573 @@
     }
 
+    /**
+     * @ticket 14162
+     */
+    public function test_should_return_wp_term_objects() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+
+        $found = get_terms( 'wptests_tax', array(
+            'hide_empty' => false,
+            'fields' => 'all',
+        ) );
+
+        $this->assertNotEmpty( $found );
+
+        foreach ( $found as $term ) {
+            $this->assertInstanceOf( 'WP_Term', $term );
+        }
+    }
+
+    /**
+     * @ticket 14162
+     */
+    public function test_should_prime_individual_term_cache_when_fields_is_all() {
+        global $wpdb;
+
+        register_taxonomy( 'wptests_tax', 'post' );
+        $terms = $this->factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+
+        $found = get_terms( 'wptests_tax', array(
+            'hide_empty' => false,
+            'fields' => 'all',
+        ) );
+
+        $num_queries = $wpdb->num_queries;
+        $term0 = get_term( $terms[0] );
+        $this->assertSame( $num_queries, $wpdb->num_queries );
+
+    }
+
     protected function create_hierarchical_terms_and_posts() {
         $terms = array();