Ticket #22560: 22560.2.diff

wp-includes/taxonomy.php

@@ -2238 +2238 @@
                                 return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
         }
 
+        wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+
         do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
         return $tt_ids;
 }

wp-includes/post.php

@@ -3196 +3196 @@
                 $tags = array_unique( array_map( 'intval', $tags ) );
         }
 
-        $r = wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
-        if ( is_wp_error( $r ) )
-                return $r;
-
-        wp_cache_delete( $post_id, $taxonomy . '_relationships' );
-
-        return $r;
+        return wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
 }
 
 /**