Ticket #11003: 11003.patch

wp-includes/taxonomy.php

@@ -1191 +1191 @@
  * The second argument is called, 'order' and has the default value of 'ASC'.
  * The only other value that will be acceptable is 'DESC'.
  *
- * The final argument supported is called, 'fields' and has the default value of
+ * The third argument supported is called, 'fields' and has the default value of
  * 'all'. There are multiple other options that can be used instead. Supported
- * values are as follows: 'all', 'ids', 'names', and finally
+ * values are as follows: 'all', 'ids', 'tt_ids', 'names', and finally
  * 'all_with_object_id'.
- *
+ * 
  * The fields argument also decides what will be returned. If 'all' or
  * 'all_with_object_id' is choosen or the default kept intact, then all matching
- * terms objects will be returned. If either 'ids' or 'names' is used, then an
- * array of all matching term ids or term names will be returned respectively.
+ * terms objects will be returned. If either 'ids', 'tt_ids' or 'names' is used, then 
+ * an array of all matching term ids, undocumented (tt_ids) or term names will be 
+ * returned respectively.
+ * 
+ * The fourth argument is called, 'select' and has the default value of 'all'.
+ * The other value that is supported is 'distinct', which will ensure no duplicate 
+ * terms are returned (compare to SELECT ALL / SELECT DISTINCT in MySQL).
  *
  * @package WordPress
  * @subpackage Taxonomy
@@ -1226 +1231 @@
                 $object_ids = array($object_ids);
         $object_ids = array_map('intval', $object_ids);
 
-        $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all');
+        $defaults = array('orderby' => 'name', 'order' => 'ASC', 'fields' => 'all', 'select' => 'all');
         $args = wp_parse_args( $args, $defaults );
 
         $terms = array();
@@ -1296 +1301 @@
 
         if ( ! $terms )
                 $terms = array();
+                
+        if ( 'distinct' ==  $select ) {
+                if ( in_array( $fields, array('ids', 'names', 'tt_ids') ) ) {
+                        $terms = array_unique( $terms );
+                } else {
+                        $_terms = array();
+                        foreach( $terms as $key => $term )
+                                $_terms[$term->term_id] =& $terms[$key];                        
+                        $terms = $_terms;
+                }               
+        }
 
         return apply_filters('wp_get_object_terms', $terms, $object_ids, $taxonomies, $args);
 }