Changeset 13821 for trunk/wp-includes/taxonomy.php

Timestamp:

03/26/2010 02:00:17 PM (16 years ago)

Author:

nacin

Message:

Correct inline docs and parameter names for get_objects_in_term() to reflect that it uses term ids, not term slugs. fixes #11835

File:

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

trunk/wp-includes/taxonomy.php

@@ -352 +352 @@
  * @uses wp_parse_args() Creates an array from string $args.
  *
- * @param string|array $terms String of term or array of string values of terms that will be used
+ * @param int|array $term_ids Term id or array of term ids of terms that will be used
  * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names
  * @param array|string $args Change the order of the object_ids, either ASC or DESC
@@ -358 +358 @@
  *  the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
  */
-function get_objects_in_term( $terms, $taxonomies, $args = array() ) {
+function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
     global $wpdb;
 
-    if ( !is_array( $terms) )
-        $terms = array($terms);
-
-    if ( !is_array($taxonomies) )
-        $taxonomies = array($taxonomies);
+    if ( ! is_array( $term_ids ) )
+        $term_ids = array( $term_ids );
+
+    if ( ! is_array( $taxonomies ) )
+        $taxonomies = array( $taxonomies );
 
     foreach ( (array) $taxonomies as $taxonomy ) {
-        if ( ! is_taxonomy($taxonomy) )
-            return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
-    }
-
-    $defaults = array('order' => 'ASC');
+        if ( ! is_taxonomy( $taxonomy ) )
+            return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
+    }
+
+    $defaults = array( 'order' => 'ASC' );
     $args = wp_parse_args( $args, $defaults );
-    extract($args, EXTR_SKIP);
-
-    $order = ( 'desc' == strtolower($order) ) ? 'DESC' : 'ASC';
-
-    $terms = array_map('intval', $terms);
-
-    $taxonomies = "'" . implode("', '", $taxonomies) . "'";
-    $terms = "'" . implode("', '", $terms) . "'";
-
-    $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($terms) ORDER BY tr.object_id $order");
+    extract( $args, EXTR_SKIP );
+
+    $order = ( 'desc' == strtolower( $order ) ) ? 'DESC' : 'ASC';
+
+    $term_ids = array_map('intval', $term_ids );
+
+    $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
+    $term_ids = "'" . implode( "', '", $term_ids ) . "'";
+
+    $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
 
     if ( ! $object_ids )