Changes from trunk/src/wp-includes/category-template.php at r35293 to branches/4.4/src/wp-includes/category-template.php at r36006
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.4/src/wp-includes/category-template.php
r35293 r36006 551 551 552 552 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'] ) ); 554 554 } 555 555 556 556 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'] ) ); 558 558 } 559 559 … … 1149 1149 if ( false === $terms ) { 1150 1150 $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 } 1159 1163 1160 1164 /**
Note: See TracChangeset
for help on using the changeset viewer.