Ticket #15475: 15475.diff

wp-includes/taxonomy.php

@@ -2160 +2160 @@
 }
 
 /**
+ * Remove term(s) associated with a given object.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.3
+ * @uses $wpdb
+ *
+ * @param int|array $object_ids The ID(s) of the object(s) to retrieve.
+ * @param array|int|string $terms The slug or id of the term to remove.
+ * @param string|array $taxonomies The taxonomies to retrieve terms from.
+ * @return bool|WP_Error Affected Term IDs
+ */
+function wp_unset_object_terms( $object_id, $terms, $taxonomy ) {
+        global $wpdb;
+
+        $object_id = (int) $object_id;
+
+        if ( ! taxonomy_exists($taxonomy) )
+                return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
+
+        if ( !is_array($terms) )
+                $terms = array($terms);
+
+        $tt_ids = array();
+        $term_ids = array();
+        foreach ( (array) $terms as $term) {
+                if ( !strlen(trim($term)) )
+                        continue;
+
+                if ( !$term_info = term_exists($term, $taxonomy) ) {
+                        // Skip if a non-existent term ID is passed.
+                        if ( is_int($term) )
+                                continue;
+                }
+                if ( is_wp_error($term_info) )
+                        return $term_info;
+                $term_ids[] = $term_info['term_id'];
+                $tt_id = $term_info['term_taxonomy_id'];
+                $tt_ids[] = $tt_id;
+
+        }
+
+        $delete_terms = $tt_ids;
+        if ( $delete_terms ) {
+                $in_delete_terms = "'" . implode("', '", $delete_terms) . "'";
+                do_action( 'delete_term_relationship', $object_id, $delete_terms );
+                $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_delete_terms)", $object_id) );
+                do_action( 'deleted_term_relationship', $object_id, $delete_terms );
+                wp_update_term_count($delete_terms, $taxonomy);
+                return true;
+        }
+        return false;
+}
+
+/**
  * Will make slug unique, if it isn't already.
  *
  * The $slug has to be unique global to every taxonomy, meaning that one