Ticket #4384: wp-taxonomy-svn-2007-06-01.diff

wp-includes/taxonomy.php

@@ -466 +466 @@
 function &get_terms($taxonomies, $args = '') {
         global $wpdb;
 
+        $defaults = array('orderby' => 'name', 'order' => 'ASC',
+                'hide_empty' => true, 'exclude' => '', 'include' => '',
+                'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
+                'hierarchical' => true, 'child_of' => 0, 'get' => '');
+        $args = wp_parse_args( $args, $defaults );
+
+    if ( !empty($args['type']) )
+        $taxonomies = $args['type'];
+
         $single_taxonomy = false;
         if ( !is_array($taxonomies) ) {
                 $single_taxonomy = true;
@@ -473 +482 @@
         }
 
         $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
-
-        $defaults = array('orderby' => 'name', 'order' => 'ASC',
-                'hide_empty' => true, 'exclude' => '', 'include' => '',
-                'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
-                'hierarchical' => true, 'child_of' => 0, 'get' => '');
-        $args = wp_parse_args( $args, $defaults );
+    
         $args['number'] = (int) $args['number'];
         if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) ||
                 '' != $args['parent'] ) {
@@ -493 +497 @@
         }
         extract($args);
 
+
         if ( $child_of ) {
                 $hierarchy = _get_term_hierarchy($taxonomies[0]);
                 if ( !isset($hierarchy[$child_of]) )
@@ -862 +867 @@
         }
 }
 
-?>
- No newline at end of file
+?>