<!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>[32453] trunk/src/wp-includes/taxonomy.php: Fix a wide variety of syntactical, spacing, wording, and other issues in wp-includes/taxonomy.php.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32453">32453</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32453","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-07 06:13:27 +0000 (Thu, 07 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Fix a wide variety of syntactical, spacing, wording, and other issues in wp-includes/taxonomy.php.
See <a href="https://core.trac.wordpress.org/ticket/32246">#32246</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2015-05-07 05:32:29 UTC (rev 32452)
+++ trunk/src/wp-includes/taxonomy.php 2015-05-07 06:13:27 UTC (rev 32453)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,8 +209,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_taxonomies The registered taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $taxonomy Name of taxonomy object to return
- * @return object|bool The Taxonomy Object or false if $taxonomy doesn't exist
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Name of taxonomy object to return.
+ * @return object|bool The Taxonomy Object or false if $taxonomy doesn't exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_taxonomy( $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_taxonomies The registered taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $taxonomy Name of taxonomy object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Name of taxonomy object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the taxonomy exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function taxonomy_exists( $taxonomy ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,8 +249,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $taxonomy Name of taxonomy object
- * @return bool Whether the taxonomy is hierarchical
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Name of taxonomy object.
+ * @return bool Whether the taxonomy is hierarchical.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_taxonomy_hierarchical($taxonomy) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! taxonomy_exists($taxonomy) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,6 +319,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * * Defaults to _update_generic_term_count() for taxonomies attached to other object types, such as links.
</span><span class="cx" style="display: block; padding: 0 10px"> * - _builtin - true if this taxonomy is a native or "built-in" taxonomy. THIS IS FOR INTERNAL USE ONLY!
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Document $args as a hash notation.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0 Introduced `show_in_quick_edit` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,10 +475,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Better documentation for the labels array.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object $tax Taxonomy object
- * @return object object with all the labels as member variables
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param object $tax Taxonomy object.
+ * @return object object with all the labels as member variables.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function get_taxonomy_labels( $tax ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,9 +522,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_taxonomies The registered taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $taxonomy Name of taxonomy object
- * @param string $object_type Name of the object type
- * @return bool True if successful, false if not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Name of taxonomy object.
+ * @param string $object_type Name of the object type.
+ * @return bool True if successful, false if not.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_taxonomy_for_object_type( $taxonomy, $object_type) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,10 +592,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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
- * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
+ * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
</ins><span class="cx" style="display: block; padding: 0 10px"> * 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" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Class for generating SQL clauses that filter a primary query according to object taxonomy terms.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * `WP_Tax_Query` is a helper that allows primary query classes, such as {@see WP_Query}, to filter
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * `WP_Tax_Query` is a helper that allows primary query classes, such as WP_Query, to filter
</ins><span class="cx" style="display: block; padding: 0 10px"> * their results by object metadata, by generating `JOIN` and `WHERE` subclauses to be attached
</span><span class="cx" style="display: block; padding: 0 10px"> * to the primary SQL query string.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -697,7 +701,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Terms and taxonomies fetched by this query.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * We store this data in a flat array because they are referenced in a
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * number of places by {@see WP_Query}.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * number of places by WP_Query.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Generate SQL clauses to be appended to a main query.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Called by the public {@see WP_Tax_Query::get_sql()}, this method
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Called by the public WP_Tax_Query::get_sql(), this method
</ins><span class="cx" style="display: block; padding: 0 10px"> * is abstracted out to maintain parity with the other Query classes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,7 +1021,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb The WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $clause Query clause, passed by reference
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $clause Query clause, passed by reference.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $parent_query Parent query array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><span class="cx" style="display: block; padding: 0 10px"> * Array containing JOIN and WHERE SQL clauses to append to a first-order query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,7 +1139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * An existing alias is compatible if (a) it is a sibling of `$clause`
</span><span class="cx" style="display: block; padding: 0 10px"> * (ie, it's under the scope of the same relation), and (b) the combination
</span><span class="cx" style="display: block; padding: 0 10px"> * of operator and relation between the clauses allows for a shared table
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * join. In the case of {@see WP_Tax_Query}, this only applies to 'IN'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * join. In the case of WP_Tax_Query, this only applies to 'IN'
</ins><span class="cx" style="display: block; padding: 0 10px"> * clauses that are connected by the relation 'OR'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,7 +1233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array &$query The single query.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * or 'term_id'. Default: 'term_id'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * or 'term_id'. Default 'term_id'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function transform_query( &$query, $resulting_field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1308,15 +1312,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * term object, and the taxonomy name as parameters. Both hooks are expected to
</span><span class="cx" style="display: block; padding: 0 10px"> * return a Term object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'get_term' hook - Takes two parameters the term Object and the taxonomy name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * {@see 'get_term'} hook - Takes two parameters the term Object and the taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Must return term object. Used in get_term() as a catch-all filter for every
</span><span class="cx" style="display: block; padding: 0 10px"> * $term.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 'get_$taxonomy' hook - Takes two parameters the term Object and the taxonomy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * {@see 'get_$taxonomy'} hook - Takes two parameters the term Object and the taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> * name. Must return term object. $taxonomy will be the taxonomy name, so for
</span><span class="cx" style="display: block; padding: 0 10px"> * example, if 'category', it would be 'get_category' as the filter name. Useful
</span><span class="cx" style="display: block; padding: 0 10px"> * for custom taxonomies or plugging into default taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Better formatting for DocBlock
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,6 +1413,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If $value does not exist, the return value will be false. If $taxonomy exists
</span><span class="cx" style="display: block; padding: 0 10px"> * and $field and $value combinations exist, the Term will be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Better formatting for DocBlock.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1479,9 +1487,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $term_id ID of Term to get children
- * @param string $taxonomy Taxonomy Name
- * @return array|WP_Error List of Term IDs. WP_Error returned if $taxonomy does not exist
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $term_id ID of Term to get children.
+ * @param string $taxonomy Taxonomy Name.
+ * @return array|WP_Error List of Term IDs. WP_Error returned if `$taxonomy` does not exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_children( $term_id, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! taxonomy_exists($taxonomy) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1517,10 +1525,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $field Term field to fetch
- * @param int $term Term ID
- * @param string $taxonomy Taxonomy Name
- * @param string $context Optional, default is display. Look at sanitize_term_field() for available options.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $field Term field to fetch.
+ * @param int $term Term ID.
+ * @param string $taxonomy Taxonomy Name.
+ * @param string $context Optional, default is display. Look at sanitize_term_field() for available options.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Will return an empty string if $term is not an object or if $field is not set in $term.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_field( $field, $term, $taxonomy, $context = 'display' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1546,8 +1554,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|object $id Term ID or Object
- * @param string $taxonomy Taxonomy Name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|object $id Term ID or object.
+ * @param string $taxonomy Taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed|null|WP_Error Will return empty string if $term is not an object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_to_edit( $id, $taxonomy ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1568,15 +1576,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * You can fully inject any customizations to the query before it is sent, as
</span><span class="cx" style="display: block; padding: 0 10px"> * well as control the output with a filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The 'get_terms' filter will be called when the cache has the term and will
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The {@see 'get_terms'} filter will be called when the cache has the term and will
</ins><span class="cx" style="display: block; padding: 0 10px"> * pass the found term along with the array of $taxonomies and array of $args.
</span><span class="cx" style="display: block; padding: 0 10px"> * This filter is also called before the array of terms is passed and will pass
</span><span class="cx" style="display: block; padding: 0 10px"> * the array of terms, along with the $taxonomies and $args.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The 'list_terms_exclusions' filter passes the compiled exclusions along with
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The {@see 'list_terms_exclusions'} filter passes the compiled exclusions along with
</ins><span class="cx" style="display: block; padding: 0 10px"> * the $args.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The 'get_terms_orderby' filter passes the ORDER BY clause for the query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The {@see 'get_terms_orderby'} filter passes the `ORDER BY` clause for the query
</ins><span class="cx" style="display: block; padding: 0 10px"> * along with the $args array.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1692,7 +1700,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $args An array of arguments.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args An array of get_term() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies An array of taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'get_terms_args', $args, $taxonomies );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1724,7 +1732,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // $args can be whatever, only use the args defined in defaults to compute the key
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // $args can be whatever, only use the args defined in defaults to compute the key.
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $defaults ) ) ) . serialize( $taxonomies ) . $filter_key );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_changed = wp_cache_get( 'last_changed', 'terms' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1743,7 +1751,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $cache Cached array of terms for the given taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies An array of taxonomies.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $args An array of arguments to get terms.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args An array of get_terms() arguments.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = apply_filters( 'get_terms', $cache, $taxonomies, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> return $cache;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1770,12 +1778,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 't.name';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the ORDERBY clause of the terms query.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $orderby ORDERBY clause of the terms query.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $orderby `ORDERBY` clause of the terms query.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of terms query arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies An array of taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1847,7 +1856,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $exclusions NOT IN clause of the terms query.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $exclusions `NOT IN` clause of the terms query.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of terms query arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies An array of taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1900,7 +1909,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $number = $args['number'];
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = $args['offset'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // don't limit the query results when we have to descend the family tree
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't limit the query results when we have to descend the family tree.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $offset ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limits = 'LIMIT ' . $offset . ',' . $number;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1975,6 +1984,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of terms query arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2032,7 +2042,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // It really is empty
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // It really is empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($terms[$k]);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2149,10 +2159,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|object $term1 ID or object to check if this is the parent term.
- * @param int|object $term2 The child term.
- * @param string $taxonomy Taxonomy name that $term1 and $term2 belong to.
- * @return bool Whether $term2 is child of $term1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|object $term1 ID or object to check if this is the parent term.
+ * @param int|object $term2 The child term.
+ * @param string $taxonomy Taxonomy name that $term1 and `$term2` belong to.
+ * @return bool Whether `$term2` is a child of `$term1`.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $term1->term_id ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2179,10 +2189,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array|object $term The term to check
- * @param string $taxonomy The taxonomy name to use
- * @param string $context Default is 'display'.
- * @return array|object Term with all fields sanitized
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|object $term The term to check.
+ * @param string $taxonomy The taxonomy name to use.
+ * @param string $context Optional. Context in which to sanitize the term. Accepts 'edit', 'db',
+ * 'display', 'attribute', or 'js'. Default 'display'.
+ * @return array|object Term with all fields sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_term($term, $taxonomy, $context = 'display') {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2227,12 +2238,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $field Term field to sanitize
- * @param string $value Search for this term value
- * @param int $term_id Term ID
- * @param string $taxonomy Taxonomy Name
- * @param string $context Either edit, db, display, attribute, or js.
- * @return mixed sanitized field
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $field Term field to sanitize.
+ * @param string $value Search for this term value.
+ * @param int $term_id Term ID.
+ * @param string $taxonomy Taxonomy Name.
+ * @param string $context Context in which to sanitize the term field. Accepts 'edit', 'db', 'display',
+ * 'attribute', or 'js'.
+ * @return mixed Sanitized field.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2272,6 +2284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_id Term ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'description' == $field )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_html($value); // textarea_escaped
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2301,6 +2314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value Value of the taxonomy field.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "pre_{$taxonomy}_{$field}", $value );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back compat filters
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'slug' == $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2332,7 +2346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the taxonomy field for use in RSS.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The dynamic portions of the hook name, `$taxonomy`, and $field, refer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The dynamic portions of the hook name, `$taxonomy`, and `$field`, refer
</ins><span class="cx" style="display: block; padding: 0 10px"> * to the taxonomy slug and field name, respectively.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2360,7 +2374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the taxonomy field sanitized for display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The dynamic portions of the filter name, `$taxonomy`, and $field, refer
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The dynamic portions of the filter name, `$taxonomy`, and `$field`, refer
</ins><span class="cx" style="display: block; padding: 0 10px"> * to the taxonomy slug and taxonomy field, respectively.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2385,6 +2399,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Document $args as a hash notation.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy name
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2415,7 +2431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $object_id The term Object Id that refers to the term
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $object_id The term Object Id that refers to the term.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2437,19 +2453,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If the term is a parent of other terms, then the children will be updated to
</span><span class="cx" style="display: block; padding: 0 10px"> * that term's parent.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The $args 'default' will only override the terms found, if there is only one
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The `$args` 'default' will only override the terms found, if there is only one
</ins><span class="cx" style="display: block; padding: 0 10px"> * term found. Any other and the found terms are used.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The $args 'force_default' will force the term supplied as default to be
</span><span class="cx" style="display: block; padding: 0 10px"> * assigned even if the object was not going to be termless
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Document $args as a hash notation.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $term Term ID
- * @param string $taxonomy Taxonomy Name
- * @param array|string $args Optional. Change 'default' term id and override found term ids.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $term Term ID.
+ * @param string $taxonomy Taxonomy Name.
+ * @param array|string $args Optional. Change 'default' term id and override found term ids.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error Returns false if not term; true if completes delete action.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_term( $term, $taxonomy, $args = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2513,6 +2531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $edit_tt_ids An array of term taxonomy IDs for the given term.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'edit_term_taxonomies', $edit_tt_ids );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id) + compact( 'taxonomy' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean the cache for all child terms.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2544,7 +2563,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms($object, $terms, $taxonomy);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean the relationship caches for all object types using this term
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clean the relationship caches for all object types using this term.
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax_object = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tax_object->object_type as $object_type )
</span><span class="cx" style="display: block; padding: 0 10px"> clean_object_term_cache( $objects, $object_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2601,7 +2620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term Term ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $tt_id Term taxonomy ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $deleted_term Copy of the already-deleted term, in the form specified
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * by the parent function. {@see WP_Error} otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * by the parent function. WP_Error otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3198,9 +3217,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $object_id The ID of the object to which the terms will be added.
- * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to add.
- * @param array|string $taxonomy Taxonomy name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $object_id The ID of the object to which the terms will be added.
+ * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to add.
+ * @param array|string $taxonomy Taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error Affected Term IDs
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_add_object_terms( $object_id, $terms, $taxonomy ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3214,9 +3233,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $object_id The ID of the object from which the terms will be removed.
- * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to remove.
- * @param array|string $taxonomy Taxonomy name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $object_id The ID of the object from which the terms will be removed.
+ * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to remove.
+ * @param array|string $taxonomy Taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error True on success, false or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3276,6 +3295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $tt_ids An array of term taxonomy IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deleted_term_relationships', $object_id, $tt_ids );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_term_count( $tt_ids, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) $deleted;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3287,7 +3307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Will make slug unique, if it isn't already.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The $slug has to be unique global to every taxonomy, meaning that one
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The `$slug` has to be unique global to every taxonomy, meaning that one
</ins><span class="cx" style="display: block; padding: 0 10px"> * taxonomy term can't have a matching slug with another taxonomy term. Each
</span><span class="cx" style="display: block; padding: 0 10px"> * slug has to be globally unique for every taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3297,17 +3317,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If that still doesn't return an unique slug, then it try to append a number
</span><span class="cx" style="display: block; padding: 0 10px"> * until it finds a number that is truly unique.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The only purpose for $term is for appending a parent, if one exists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The only purpose for `$term` is for appending a parent, if one exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $slug The string that will be tried for a unique slug
- * @param object $term The term object that the $slug will belong too
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $slug The string that will be tried for a unique slug.
+ * @param object $term The term object that the $slug will belong too.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Will return a true unique slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_unique_term_slug($slug, $term) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_unique_term_slug( $slug, $term ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! term_exists( $slug ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3318,8 +3338,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $slug;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
- // by incorporating parent slugs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the taxonomy supports hierarchy and the term has a parent, make the slug unique
+ * by incorporating parent slugs.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical($term->taxonomy) && !empty($term->parent) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_parent = $term->parent;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ! empty($the_parent) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3373,16 +3395,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * a WP_Error will be passed back. If you don't pass any slug, then a unique one
</span><span class="cx" style="display: block; padding: 0 10px"> * will be created for you.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * For what can be overrode in $args, check the term scheme can contain and stay
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For what can be overrode in `$args`, check the term scheme can contain and stay
</ins><span class="cx" style="display: block; padding: 0 10px"> * away from the term keys.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $term_id The ID of the term
- * @param string $taxonomy The context in which to relate the term to the object.
- * @param array|string $args Overwrite term field values
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $term_id The ID of the term
+ * @param string $taxonomy The context in which to relate the term to the object.
+ * @param array|string $args Optional. Array of get_terms() arguments. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error Returns Term ID and Taxonomy Term ID
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_term( $term_id, $taxonomy, $args = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3529,6 +3551,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy slug.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'edit_term_taxonomy', $tt_id, $taxonomy );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent' ), array( 'term_taxonomy_id' => $tt_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3541,7 +3564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'edited_term_taxonomy', $tt_id, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean the relationship caches for all object types using this term
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clean the relationship caches for all object types using this term.
</ins><span class="cx" style="display: block; padding: 0 10px"> $objects = $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_object = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tax_object->object_type as $object_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3638,8 +3661,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|array $terms The term_taxonomy_id of the terms
- * @param string $taxonomy The context of the term.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|array $terms The term_taxonomy_id of the terms.
+ * @param string $taxonomy The context of the term.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool If no terms will return false, and if successful will return true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_term_count( $terms, $taxonomy, $do_deferred=false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3673,7 +3696,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $terms The term_taxonomy_id of terms to update.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms The term_taxonomy_id of terms to update.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The context of the term.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Always true when complete.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3711,16 +3734,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Removes the taxonomy relationship to terms from the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Will remove the entire taxonomy relationship containing term $object_id. The
- * term IDs have to exist within the taxonomy $object_type for the deletion to
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Will remove the entire taxonomy relationship containing term `$object_id`. The
+ * term IDs have to exist within the taxonomy `$object_type` for the deletion to
</ins><span class="cx" style="display: block; padding: 0 10px"> * take place.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @see get_object_taxonomies() for more on $object_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see get_object_taxonomies() for more on $object_type.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|array $object_ids Single or list of term object ID(s)
- * @param array|string $object_type The taxonomy object type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|array $object_ids Single or list of term object ID(s).
+ * @param array|string $object_type The taxonomy object type.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function clean_object_term_cache($object_ids, $object_type) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_array($object_ids) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3752,9 +3775,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int|array $ids Single or list of Term IDs
- * @param string $taxonomy Can be empty and will assume tt_ids, else will use for context.
- * @param bool $clean_taxonomy Whether to clean taxonomy wide caches (true), or just individual term object caches (false). Default is true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|array $ids Single or list of Term IDs.
+ * @param string $taxonomy Optional. Can be empty and will assume `tt_ids`, else will use for context.
+ * Default empty.
+ * @param bool $clean_taxonomy Optional. Whether to clean taxonomy wide caches (true), or just individual
+ * term object caches (false). Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3812,11 +3837,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $id Term object ID
- * @param string $taxonomy Taxonomy Name
- * @return bool|array Empty array if $terms found, but not $taxonomy. False if nothing is in cache for $taxonomy and $id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $id Term object ID.
+ * @param string $taxonomy Taxonomy name.
+ * @return bool|array Empty array if $terms found, but not `$taxonomy`. False if nothing is in cache
+ * for `$taxonomy` and `$id`.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_object_term_cache($id, $taxonomy) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_object_term_cache( $id, $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cache = wp_cache_get($id, "{$taxonomy}_relationships");
</span><span class="cx" style="display: block; padding: 0 10px"> return $cache;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3833,7 +3859,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|array $object_ids Comma-separated list or array of term object IDs..
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|array $object_ids Comma-separated list or array of term object IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $object_type The taxonomy object type.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|false Null if `$object_ids` is empty, false if all of the terms in
</span><span class="cx" style="display: block; padding: 0 10px"> * `$object_ids` are already cached.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3890,10 +3916,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $terms List of Term objects to change
- * @param string $taxonomy Optional. Update Term to this taxonomy in cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of term objects to change.
+ * @param string $taxonomy Optional. Update Term to this taxonomy in cache. Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function update_term_cache($terms, $taxonomy = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function update_term_cache( $terms, $taxonomy = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_taxonomy = $taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($term_taxonomy) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3910,13 +3936,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves children of taxonomy as Term IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @access private
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ignore
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $taxonomy Taxonomy Name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _get_term_hierarchy($taxonomy) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _get_term_hierarchy( $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_taxonomy_hierarchical($taxonomy) )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> $children = get_option("{$taxonomy}_children");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3937,19 +3963,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the subset of $terms that are descendants of $term_id.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If $terms is an array of objects, then _get_term_children returns an array of objects.
- * If $terms is an array of IDs, then _get_term_children returns an array of IDs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If `$terms` is an array of objects, then _get_term_children() returns an array of objects.
+ * If `$terms` is an array of IDs, then _get_term_children() returns an array of IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $term_id The ancestor term: all returned terms should be descendants of $term_id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $term_id The ancestor term: all returned terms should be descendants of `$term_id`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $terms The set of terms - either an array of term objects or term IDs - from which those that
</span><span class="cx" style="display: block; padding: 0 10px"> * are descendants of $term_id will be chosen.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The taxonomy which determines the hierarchy of the terms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $ancestors Term ancestors that have already been identified. Passed by reference, to keep track of
- * found terms when recursing the hierarchy. The array of located ancestors is used to prevent
- * infinite recursion loops. For performance, term_ids are used as array keys, with 1 as value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $ancestors Optional. Term ancestors that have already been identified. Passed by reference, to keep
+ * track of found terms when recursing the hierarchy. The array of located ancestors is used
+ * to prevent infinite recursion loops. For performance, `term_ids` are used as array keys,
+ * with 1 as value. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The subset of $terms that are descendants of $term_id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4012,11 +4039,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $terms List of Term IDs
- * @param string $taxonomy Term Context
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of term IDs, passed by reference.
+ * @param string $taxonomy Term context.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return null Will break from function if conditions are not met.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _pad_term_counts(&$terms, $taxonomy) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _pad_term_counts( &$terms, $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This function only works for hierarchical taxonomies like post categories.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4037,7 +4064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids[$term->term_taxonomy_id] = $term->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the object and term ids and stick them in a lookup table
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the object and term ids and stick them in a lookup table.
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax_obj = get_taxonomy($taxonomy);
</span><span class="cx" style="display: block; padding: 0 10px"> $object_types = esc_sql($tax_obj->object_type);
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4046,7 +4073,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Touch every ancestor's lookup row for each post in each term
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Touch every ancestor's lookup row for each post in each term.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_ids as $term_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $child = $term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $ancestors = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4064,7 +4091,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Transfer the touched cells
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Transfer the touched cells.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $term_items as $id => $items )
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($terms_by_id[$id]) )
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_by_id[$id]->count = count($items);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4085,8 +4112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $terms List of Term taxonomy IDs
- * @param object $taxonomy Current taxonomy object of terms
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of Term taxonomy IDs.
+ * @param object $taxonomy Current taxonomy object of terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _update_post_term_count( $terms, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4109,7 +4136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Attachments can be 'inherit' status, we need to base count off the parent's status if so
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Attachments can be 'inherit' status, we need to base count off the parent's status if so.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $check_attachments )
</span><span class="cx" style="display: block; padding: 0 10px"> $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4128,14 +4155,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Will update term count based on number of objects.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default callback for the link_category taxonomy.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default callback for the 'link_category' taxonomy.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $terms List of Term taxonomy IDs
- * @param object $taxonomy Current taxonomy object of terms
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of term taxonomy IDs.
+ * @param object $taxonomy Current taxonomy object of terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _update_generic_term_count( $terms, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4355,7 +4382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Optional. Taxonomy. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_term_link( $term, $taxonomy = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_term_link( $term, $taxonomy = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_object($term) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4452,8 +4479,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Arguments about which post to use and how to format the output. Shares all of the arguments supported by
- * {@link get_the_taxonomies()}, in addition to the following.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Arguments about which post to use and how to format the output. Shares all of the arguments
+ * supported by get_the_taxonomies(), in addition to the following.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int|WP_Post $post Post ID or object to get taxonomies of. Default current post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $before Displays before the taxonomies. Default empty string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4485,7 +4512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Arguments about how to format the list of taxonomies.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Optional. Arguments about how to format the list of taxonomies. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $template Template for displaying a taxonomy label and list of terms.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default is "Label: Terms."
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4563,9 +4590,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $object_id ID of the object (post ID, link ID, ...)
- * @param string $taxonomy Single taxonomy name
- * @param int|string|array $terms Optional. Term term_id, name, slug or array of said
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $object_id ID of the object (post ID, link ID, ...).
+ * @param string $taxonomy Single taxonomy name.
+ * @param int|string|array $terms Optional. Term term_id, name, slug or array of said. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error WP_Error on input error.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4616,8 +4643,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $object_type Object type string
- * @param string $taxonomy Single taxonomy name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $object_type Object type string.
+ * @param string $taxonomy Single taxonomy name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if object is associated with the taxonomy, otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_object_in_taxonomy($object_type, $taxonomy) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4689,14 +4716,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the term's parent's term_ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the term's parent's term_ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $term_id
- * @param string $taxonomy
- *
- * @return int|bool false on error
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $term_id Term ID.
+ * @param string $taxonomy Taxonomy name.
+ * @return int|bool False on error.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( $term_id, $taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4709,12 +4735,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks the given subset of the term hierarchy for hierarchy loops.
</span><span class="cx" style="display: block; padding: 0 10px"> * Prevents loops from forming and breaks those that it finds.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Attached to the wp_update_term_parent filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Attached to the {@see 'wp_update_term_parent'} filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $parent term_id of the parent for the term we're checking.
- * @param int $term_id The term we're checking.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $parent `term_id` of the parent for the term we're checking.
+ * @param int $term_id The term we're checking.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The taxonomy of the term we're checking.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int The new parent for the term.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4724,16 +4750,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$parent )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Can't be its own parent
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Can't be its own parent.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $parent == $term_id )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Now look for larger loops
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now look for larger loops.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent; // No loop
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Setting $parent to the given value causes a loop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Setting $parent to the given value causes a loop.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $loop[$term_id] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>