<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13821] trunk/wp-includes/taxonomy.php:
Correct inline docs and parameter names for get_objects_in_term()
to reflect that it uses term ids, not term slugs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13821">13821</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-26 14:00:17 +0000 (Fri, 26 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct inline docs and parameter names for get_objects_in_term() to reflect that it uses term ids, not term slugs. fixes <a href="http://trac.wordpress.org/ticket/11835">#11835</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (13820 => 13821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-03-26 13:56:10 UTC (rev 13820)
+++ trunk/wp-includes/taxonomy.php 2010-03-26 14:00:17 UTC (rev 13821)
</span><span class="lines">@@ -351,38 +351,38 @@
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> * @uses wp_parse_args() Creates an array from string $args.
</span><span class="cx"> *
</span><del>- * @param string|array $terms String of term or array of string values of terms that will be used
</del><ins>+ * @param int|array $term_ids Term id or array of term ids of terms that will be used
</ins><span class="cx"> * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names
</span><span class="cx"> * @param array|string $args Change the order of the object_ids, either ASC or DESC
</span><span class="cx"> * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success
</span><span class="cx"> * the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
</span><span class="cx"> */
</span><del>-function get_objects_in_term( $terms, $taxonomies, $args = array() ) {
</del><ins>+function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( !is_array( $terms) )
- $terms = array($terms);
</del><ins>+ if ( ! is_array( $term_ids ) )
+ $term_ids = array( $term_ids );
</ins><span class="cx">
</span><del>- if ( !is_array($taxonomies) )
- $taxonomies = array($taxonomies);
</del><ins>+ if ( ! is_array( $taxonomies ) )
+ $taxonomies = array( $taxonomies );
</ins><span class="cx">
</span><span class="cx"> foreach ( (array) $taxonomies as $taxonomy ) {
</span><del>- if ( ! is_taxonomy($taxonomy) )
- return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy'));
</del><ins>+ if ( ! is_taxonomy( $taxonomy ) )
+ return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $defaults = array('order' => 'ASC');
</del><ins>+ $defaults = array( 'order' => 'ASC' );
</ins><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>- extract($args, EXTR_SKIP);
</del><ins>+ extract( $args, EXTR_SKIP );
</ins><span class="cx">
</span><del>- $order = ( 'desc' == strtolower($order) ) ? 'DESC' : 'ASC';
</del><ins>+ $order = ( 'desc' == strtolower( $order ) ) ? 'DESC' : 'ASC';
</ins><span class="cx">
</span><del>- $terms = array_map('intval', $terms);
</del><ins>+ $term_ids = array_map('intval', $term_ids );
</ins><span class="cx">
</span><del>- $taxonomies = "'" . implode("', '", $taxonomies) . "'";
- $terms = "'" . implode("', '", $terms) . "'";
</del><ins>+ $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
+ $term_ids = "'" . implode( "', '", $term_ids ) . "'";
</ins><span class="cx">
</span><del>- $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");
</del><ins>+ $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");
</ins><span class="cx">
</span><span class="cx"> if ( ! $object_ids )
</span><span class="cx"> return array();
</span></span></pre>
</div>
</div>
</body>
</html>