WordPress 4.6.1-scripts

[autoinstalls/wordpress.git] / wp-includes / taxonomy.php

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 104a4afdb557ad57bdad931cc251caa089546254..70af35a3264e1db387da76ffefe533a927e98cb3 100644 (file)
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -4274,6 +4274,10 @@ function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
        $object_terms = get_object_term_cache( $object_id, $taxonomy );
        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" );
        }