Changeset 38214

Timestamp:

08/08/2016 01:13:56 PM (8 years ago)

Author:

ocean90

Message:

Taxononmy: Set WP_Term_Query::terms when returning terms from the cache in WP_Term_Query::get_terms().

Merge of [38211] and [38212] to the 4.6 branch.

Props wonderboymusic.
Props boonebgorges for review.
Fixes #37591.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-term-query.php (modified) (1 diff)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

branches/4.6/src/wp-includes/class-wp-term-query.php

@@ -642 +642 @@
             }
 
-            return $cache;
+            $this->terms = $cache;
+            return $this->terms;
         }
 

branches/4.6/tests/phpunit/tests/term/query.php

@@ -143 +143 @@
         return $clauses;
     }
+
+    /**
+     * @ticket 37591
+     */
+    public function test_terms_is_set() {
+        register_taxonomy( 'wptests_tax_1', 'post' );
+
+        self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_1' ) );
+
+        $q1 = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'hide_empty' => false
+        ) );
+
+        $this->assertNotEmpty( $q1->terms );
+
+        $q2 = new WP_Term_Query( array(
+            'taxonomy' => 'wptests_tax_1',
+            'hide_empty' => false
+        ) );
+
+        $this->assertNotEmpty( $q2->terms );
+    }
 }