WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.4/src/wp-includes/category-template.php

    r35293 r36006  
    551551
    552552        if ( $r['exclude_tree'] ) {
    553             $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude_tree'] );
     553            $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude_tree'] ) );
    554554        }
    555555
    556556        if ( $r['exclude'] ) {
    557             $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude'] );
     557            $exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude'] ) );
    558558        }
    559559
     
    11491149    if ( false === $terms ) {
    11501150        $terms = wp_get_object_terms( $post->ID, $taxonomy );
    1151         $to_cache = array();
    1152         foreach ( $terms as $key => $term ) {
    1153             $to_cache[ $key ] = $term->data;
    1154         }
    1155         wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' );
    1156     }
    1157 
    1158     $terms = array_map( 'get_term', $terms );
     1151        if ( ! is_wp_error( $terms ) ) {
     1152            $to_cache = array();
     1153            foreach ( $terms as $key => $term ) {
     1154                $to_cache[ $key ] = $term->data;
     1155            }
     1156            wp_cache_add( $post->ID, $to_cache, $taxonomy . '_relationships' );
     1157        }
     1158    }
     1159
     1160    if ( ! is_wp_error( $terms ) ) {
     1161        $terms = array_map( 'get_term', $terms );
     1162    }
    11591163
    11601164    /**
Note: See TracChangeset for help on using the changeset viewer.