From 812060f9401a0583b334fec0fa78ef6093981f10 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Thu, 10 Dec 2015 03:35:27 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@35850


git-svn-id: http://core.svn.wordpress.org/trunk@35814 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/category-template.php | 14 +++++++++-----
 wp-includes/version.php           |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 9b685edb11..68cd74c8e5 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -1148,14 +1148,18 @@ function get_the_terms( $post, $taxonomy ) {
 	$terms = get_object_term_cache( $post->ID, $taxonomy );
 	if ( false === $terms ) {
 		$terms = wp_get_object_terms( $post->ID, $taxonomy );
-		$to_cache = array();
-		foreach ( $terms as $key => $term ) {
-			$to_cache[ $key ] = $term->data;
+		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' );
 		}
-		wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' );
 	}
 
-	$terms = array_map( 'get_term', $terms );
+	if ( ! is_wp_error( $terms ) ) {
+		$terms = array_map( 'get_term', $terms );
+	}
 
 	/**
 	 * Filter the list of terms attached to the given post.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c5a1ee7072..5208cd99b8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-35849';
+$wp_version = '4.5-alpha-35850';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.