<!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" />
<title>[26010] trunk: Cast proper fields to `int` when returning from `wp_get_object_terms()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26010">26010</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-05 01:18:02 +0000 (Tue, 05 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cast proper fields to `int` when returning from `wp_get_object_terms()`. Add `term_taxonomy_id` and `object_id` to the list in `sanitize_term()` and `sanitize_term_field()`.
Fixes <a href="http://core.trac.wordpress.org/ticket/17646">#17646</a>. Adds unit tests.
Props simonwheatley, dd32, kovshenin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermphp">trunk/tests/phpunit/tests/term.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/taxonomy.php (26009 => 26010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/taxonomy.php 2013-11-05 00:57:52 UTC (rev 26009)
+++ trunk/src/wp-includes/taxonomy.php 2013-11-05 01:18:02 UTC (rev 26010)
</span><span class="lines">@@ -1658,15 +1658,10 @@
</span><span class="cx"> */
</span><span class="cx"> function sanitize_term($term, $taxonomy, $context = 'display') {
</span><span class="cx">
</span><del>- if ( 'raw' == $context )
- return $term;
</del><ins>+ $fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
</ins><span class="cx">
</span><del>- $fields = array('term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group');
</del><ins>+ $do_object = is_object( $term );
</ins><span class="cx">
</span><del>- $do_object = false;
- if ( is_object($term) )
- $do_object = true;
-
</del><span class="cx"> $term_id = $do_object ? $term->term_id : (isset($term['term_id']) ? $term['term_id'] : 0);
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $fields as $field ) {
</span><span class="lines">@@ -1714,11 +1709,9 @@
</span><span class="cx"> * @return mixed sanitized field
</span><span class="cx"> */
</span><span class="cx"> function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
</span><del>- if ( 'parent' == $field || 'term_id' == $field || 'count' == $field || 'term_group' == $field ) {
- $value = (int) $value;
- if ( $value < 0 )
- $value = 0;
- }
</del><ins>+ $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
+ if ( in_array( $field, $int_fields ) )
+ $value = absint( $value );
</ins><span class="cx">
</span><span class="cx"> if ( 'raw' == $context )
</span><span class="cx"> return $value;
</span><span class="lines">@@ -2049,12 +2042,21 @@
</span><span class="cx"> $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
</span><span class="cx">
</span><span class="cx"> if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
</span><del>- $terms = array_merge($terms, $wpdb->get_results($query));
- update_term_cache($terms);
</del><ins>+ $_terms = $wpdb->get_results( $query );
+ foreach ( $_terms as &$term )
+ $term = sanitize_term( $term, $taxonomy, 'raw' );
+ $terms = array_merge( $terms, $_terms );
+ update_term_cache( $terms );
</ins><span class="cx"> } else if ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
</span><del>- $terms = array_merge($terms, $wpdb->get_col($query));
</del><ins>+ $_terms = $wpdb->get_col( $query );
+ $_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
+ foreach ( $_terms as &$term )
+ $term = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' );
+ $terms = array_merge( $terms, $_terms );
</ins><span class="cx"> } else if ( 'tt_ids' == $fields ) {
</span><span class="cx"> $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
</span><ins>+ foreach ( $terms as &$tt_id )
+ $tt_id = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! $terms )
</span></span></pre></div>
<a id="trunktestsphpunitteststermphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/term.php (26009 => 26010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/term.php 2013-11-05 00:57:52 UTC (rev 26009)
+++ trunk/tests/phpunit/tests/term.php 2013-11-05 01:18:02 UTC (rev 26010)
</span><span class="lines">@@ -433,6 +433,20 @@
</span><span class="cx"> unset( $GLOBALS['wp_taxonomies'][ $random_tax ] );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_get_object_terms_types() {
+ $post_id = $this->factory->post->create();
+ $term = wp_insert_term( 'one', $this->taxonomy );
+ wp_set_object_terms( $post_id, $term, $this->taxonomy );
+
+ $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'all_with_object_id' ) ) );
+ $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
+ foreach ( $int_fields as $field )
+ $this->assertInternalType( 'int', $term->$field, $field );
+
+ $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) ) );
+ $this->assertInternalType( 'int', $term, 'term' );
+ }
+
</ins><span class="cx"> private function assertPostHasTerms( $post_id, $expected_term_ids, $taxonomy ) {
</span><span class="cx"> $assigned_term_ids = wp_get_object_terms( $post_id, $taxonomy, array(
</span><span class="cx"> 'fields' => 'ids'
</span></span></pre>
</div>
</div>
</body>
</html>