Changes from trunk/src/wp-includes/category-template.php at r35293 to branches/4.4/src/wp-includes/category-template.php at r36006

File:

• branches/4.4/src/wp-includes/category-template.php (modified) (2 diffs)

branches/4.4/src/wp-includes/category-template.php

@@ -551 +551 @@
 
         if ( $r['exclude_tree'] ) {
-            $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude_tree'] );
+            $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude_tree'] ) );
         }
 
         if ( $r['exclude'] ) {
-            $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude'] );
+            $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude'] ) );
         }
 
@@ -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 );
+    }
 
     /**