Changeset 35850

Timestamp:

12/10/2015 03:34:51 AM (9 years ago)

Author:

boonebgorges

Message:

Improve handling for WP_Error objects in get_the_terms().

wp_get_object_terms() can return a WP_Error object. As such, the
get_the_terms() cache wrapper should handle them properly. To wit:

• Don't try to map an error object to get_term(). Introduced in [35032].
• Don't cache an error object as taxonomy relationships. Introduced in at least [16487], maybe earlier.

Props stephenharris.
Fixes #34723.

Location:

trunk

Files:

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

trunk/src/wp-includes/category-template.php

@@ -1149 +1149 @@
     if ( false === $terms ) {
         $terms = wp_get_object_terms( $post->ID, $taxonomy );
-        $to_cache = array();
-        foreach ( $terms as $key => $term ) {
-            $to_cache[ $key ] = $term->data;
-        }
-        wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' );
-    }
-
-    $terms = array_map( 'get_term', $terms );
+        if ( ! is_wp_error( $terms ) ) {
+            $to_cache = array();
+            foreach ( $terms as $key => $term ) {
+                $to_cache[ $key ] = $term->data;
+            }
+            wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' );
+        }
+    }
+
+    if ( ! is_wp_error( $terms ) ) {
+        $terms = array_map( 'get_term', $terms );
+    }
 
     /**

trunk/tests/phpunit/tests/term.php

@@ -628 +628 @@
         $this->assertWPError( $cat_id2 );
     }
+
+    /**
+     * @ticket 34723
+     */
+    function test_get_the_terms_should_return_wp_error_when_taxonomy_is_unregistered() {
+        $p = self::$post_ids[0];
+        $terms = get_the_terms( $p, 'this-taxonomy-does-not-exist' );
+        $this->assertTrue( is_wp_error( $terms ) );
+    }
 }