Changeset 10813

Timestamp:

03/18/2009 09:06:49 PM (16 years ago)

Author:

westi

Message:

Allow wp_delete_term users to force all objects to have a new term applied. Allow for category merging use-case. Fixes #9355.

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-includes/taxonomy.php

@@ -1060 +1060 @@
  * The $args 'default' will only override the terms found, if there is only one
  * term found. Any other and the found terms are used.
- *
+ * 
+ * The $args 'force_default' will force the term supplied as default to be
+ * assigned even if the object was not going to be termless
  * @package WordPress
  * @subpackage Taxonomy
@@ -1111 +1113 @@
     foreach ( (array) $objects as $object ) {
         $terms = wp_get_object_terms($object, $taxonomy, 'fields=ids');
-        if ( 1 == count($terms) && isset($default) )
+        if ( 1 == count($terms) && isset($default) ) {
             $terms = array($default);
-        else
+        } else {
             $terms = array_diff($terms, array($term));
+            if (isset($default) && isset($force_default) && $force_default)
+                $terms = array_merge($terms, array($default));
+        }
         $terms = array_map('intval', $terms);
         wp_set_object_terms($object, $terms, $taxonomy);