Changeset 38277 for trunk

Timestamp:

08/18/2016 07:14:52 PM (8 years ago)

Author:

boonebgorges

Message:

In is_object_in_term(), return error object rather than caching it.

This change prevents an error object from being stored in the cache,
and prevents notices from being thrown when plucking term IDs to put
into the relationship cache.

See #32044, #36814.

Props rpayne7264.
Fixes #37721.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/isObjectInTerm.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -4275 +4275 @@
     if ( false === $object_terms ) {
         $object_terms = wp_get_object_terms( $object_id, $taxonomy, array( 'update_term_meta_cache' => false ) );
+        if ( is_wp_error( $object_terms ) ) {
+            return $object_terms;
+        }
+
         wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
     }

trunk/tests/phpunit/tests/term/isObjectInTerm.php

@@ -147 +147 @@
         $this->assertSame( $num_queries, $wpdb->num_queries );
     }
+
+    /**
+     * @ticket 37721
+     */
+    public function test_invalid_taxonomy_should_return_wp_error_object() {
+        $this->assertWPError( is_object_in_term( 12345, 'foo', 'bar' ) );
+    }
 }