<!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>[32627] trunk/src/wp-includes/taxonomy.php: Add missing doc blocks to `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/32627">32627</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/32627","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-27 21:59:06 +0000 (Wed, 27 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'>Add missing doc blocks to `taxonomy.php`.
Correct some `@return` values.
Some functions can `return new WP_Error` without setting it to a variable.
Some functions can return their `apply_filters(...)` call without first setting it to a variable.
`is_object_in_taxonomy()` can return its conditional instead of if/else true/false.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</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-27 21:22:09 UTC (rev 32626)
+++ trunk/src/wp-includes/taxonomy.php 2015-05-27 21:59:06 UTC (rev 32627)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,9 +170,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 array|string|object $object Name of the type of taxonomy object, or an object (row from posts)
- * @param string $output Optional. The type of output to return in the array. Accepts either
- * taxonomy 'names' or 'objects'. Default 'names'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string|WP_Post $object Name of the type of taxonomy object, or an object (row from posts)
+ * @param string $output Optional. The type of output to return in the array. Accepts either
+ * taxonomy 'names' or 'objects'. Default 'names'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The names of all taxonomy of $object_type.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_object_taxonomies( $object, $output = 'names' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +210,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Name of taxonomy object to return.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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">+ * @return object|false 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">@@ -327,10 +327,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_taxonomies Registered taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP $wp WP instance.
</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 key, must not exceed 32 characters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Taxonomy key, must not exceed 32 characters.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $object_type Name of the object type for the taxonomy object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array|string $args See optional args description above.
- * @return null|WP_Error WP_Error if errors, otherwise null.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string $args See optional args description above.
+ * @return WP_Error|void WP_Error, if errors.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies, $wp;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +482,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $tax Taxonomy object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object object with all the labels as member variables.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> function get_taxonomy_labels( $tax ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax->labels = (array) $tax->labels;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,9 +591,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|array $term_ids Term id or array of term ids of terms that will be used.
</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.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array|string $args Change the order of the object_ids, either ASC or DESC.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|string $args Change the order of the object_ids, either ASC or DESC.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Tax_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">- * @param array $tax_query A compact tax query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $tax_query A compact tax query
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $primary_table
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $primary_id_column
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,6 +682,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Standard response when the query should not return any rows.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @static
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,6 +867,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * determined, by process of elimination, to be a higher-order query.
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @static
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access protected
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $query Tax query arguments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,6 +882,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Generates SQL clauses to be appended to a main query.
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @static
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $primary_table Database table where the object being filtered is stored (eg wp_users).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1147,7 +1152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $clause Query clause.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $parent_query Parent query of $clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool Table alias if found, otherwise false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false Table alias if found, otherwise false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function find_compatible_table_alias( $clause, $parent_query ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alias = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,24 +1333,22 @@
</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"> * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
</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 $term If integer, will get from database. If object will apply filters and return $term.
- * @param string $taxonomy Taxonomy name that $term is part of.
- * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N
- * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
- * @return mixed|null|WP_Error Term Row from database. Will return null if $term is empty. If taxonomy does not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|object $term If integer, will get from database. If object will apply filters and return $term.
+ * @param string $taxonomy Taxonomy name that $term is part of.
+ * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
+ * @return object|array|null|WP_Error Term Row from database. Will return null if $term is empty. If taxonomy does not
</ins><span class="cx" style="display: block; padding: 0 10px"> * exist then WP_Error will be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( empty($term) ) {
- $error = new WP_Error('invalid_term', __('Empty Term'));
- return $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $term ) ) {
+ return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
</ins><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 ( ! taxonomy_exists($taxonomy) ) {
- $error = new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
- return $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! taxonomy_exists( $taxonomy ) ) {
+ return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
</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"> if ( is_object($term) && empty($term->filter) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1420,12 +1423,13 @@
</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"> * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
</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 Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id'
- * @param string|int $value Search for this term value
- * @param string $taxonomy Taxonomy Name
- * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N
- * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
- * @return mixed Term Row from database. Will return false if $taxonomy does not exist or $term was not found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $field Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id'
+ * @param string|int $value Search for this term value
+ * @param string $taxonomy Taxonomy Name
+ * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
+ * @return object|array|null|WP_Error|false Term Row from database.
+ * Will return false if $taxonomy does not exist or $term was not found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_by($field, $value, $taxonomy, $output = OBJECT, $filter = 'raw') {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1529,7 +1533,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 string $taxonomy Taxonomy Name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Optional, default is display. Look at sanitize_term_field() for available options.
</span><del style="background-color: #fdd; text-decoration:none; 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|int|null|WP_Error Will return an empty string if $term is not an object or if $field is not set in $term.
</ins><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="cx" style="display: block; padding: 0 10px"> $term = (int) $term;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,7 +1560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|object $id Term ID or object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed|null|WP_Error Will return empty string if $term is not an object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|int|null|WP_Error Will return empty string if $term is not an object.
</ins><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="cx" style="display: block; padding: 0 10px"> $term = get_term( $id, $taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1590,7 +1594,8 @@
</span><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 'name' and 'childless' parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global wpdb $wpdb WordPress database abstraction object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
+ * @global array $wp_filter
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $taxonomies Taxonomy name or list of Taxonomy names.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1641,7 +1646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $cache_domain Unique cache key to be produced when this query is stored in an
</span><span class="cx" style="display: block; padding: 0 10px"> * object cache. Default is 'core'.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|int|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies
</ins><span class="cx" style="display: block; padding: 0 10px"> * do not exist.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_terms( $taxonomies, $args = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1655,8 +1660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! taxonomy_exists($taxonomy) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $error = new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
- return $error;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1753,8 +1757,7 @@
</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"> * @param array $args An array of get_terms() arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache = apply_filters( 'get_terms', $cache, $taxonomies, $args );
- return $cache;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_terms', $cache, $taxonomies, $args );
</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"> $_orderby = strtolower( $args['orderby'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1995,8 +1998,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'count' == $_fields ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_count = $wpdb->get_var($query);
- return $term_count;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $wpdb->get_var( $query );
</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"> $terms = $wpdb->get_results($query);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2008,8 +2010,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/taxonomy.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = apply_filters( 'get_terms', array(), $taxonomies, $args );
- return $terms;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_terms', array(), $taxonomies, $args );
</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"> if ( $child_of ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2082,8 +2083,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/taxonomy */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $terms = apply_filters( 'get_terms', $terms, $taxonomies, $args );
- return $terms;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_terms', $terms, $taxonomies, $args );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2095,9 +2095,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|string $term The term to check
- * @param string $taxonomy The taxonomy name to use
- * @param int $parent Optional. ID of parent term under which to confine the exists search.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|string $term The term to check
+ * @param string $taxonomy The taxonomy name to use
+ * @param int $parent Optional. ID of parent term under which to confine the exists search.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Returns null if the term does not exist. Returns the term ID
</span><span class="cx" style="display: block; padding: 0 10px"> * if no taxonomy is specified and the term ID exists. Returns
</span><span class="cx" style="display: block; padding: 0 10px"> * an array of the term ID and the term taxonomy ID the taxonomy
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2196,7 +2196,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|object Term with all fields sanitized.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $do_object = is_object( $term );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2236,8 +2235,6 @@
</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">- * @global wpdb $wpdb WordPress database abstraction object.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $field Term field to sanitize.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Search for this term value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_id Term ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2403,9 +2400,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 $taxonomy Taxonomy name
- * @param array|string $args Overwrite defaults. See get_terms()
- * @return int|WP_Error How many terms are in $taxonomy. WP_Error if $taxonomy does not exist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Taxonomy name
+ * @param array|string $args Overwrite defaults. See get_terms()
+ * @return array|int|WP_Error How many terms are in $taxonomy. WP_Error 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 wp_count_terms( $taxonomy, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array('hide_empty' => false);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2431,7 +2428,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">@@ -2468,7 +2465,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 string $taxonomy Taxonomy Name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args Optional. Change 'default' term id and override found term ids.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|WP_Error Returns false if not term; true if completes delete action.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|int|WP_Error Returns false if not term; true if completes delete action.
</ins><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="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2633,7 +2630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $cat_ID
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return mixed Returns true if completes delete action; false if term doesn't exist;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|int|WP_Error Returns true if completes delete action; false if term doesn't exist;
</ins><span class="cx" style="display: block; padding: 0 10px"> * Zero on attempted deletion of default Category; WP_Error object is also a possibility.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_category( $cat_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3632,6 +3629,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @staticvar bool $_defer
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param bool $defer Optional. Enable if true, disable if false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether term counting is enabled or disabled.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3659,7 +3658,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">- * @global wpdb $wpdb WordPress database abstraction object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @staticvar array $_deferred
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|array $terms The term_taxonomy_id of the terms.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The context of the term.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3698,7 +3697,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $terms The term_taxonomy_id of terms to update.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The context of the term.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool Always true when complete.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return true Always true when complete.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_update_term_count_now( $terms, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array_map('intval', $terms);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3774,6 +3773,7 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global bool $_wp_suspend_cache_invalidation
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|array $ids Single or list of Term IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Optional. Can be empty and will assume `tt_ids`, else will use for context.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3843,12 +3843,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $id Term object ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|array Empty array if $terms found, but not `$taxonomy`. False if nothing is in cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool|mixed Empty array if $terms found, but not `$taxonomy`. False if nothing is in cache
</ins><span class="cx" style="display: block; padding: 0 10px"> * for `$taxonomy` and `$id`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_object_term_cache( $id, $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache = wp_cache_get($id, "{$taxonomy}_relationships");
- return $cache;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_cache_get( $id, "{$taxonomy}_relationships" );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3865,8 +3864,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $object_ids Comma-separated list or array of term object IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $object_type The taxonomy object type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null|false Null if `$object_ids` is empty, false if all of the terms in
- * `$object_ids` are already cached.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return void|false False if all of the terms in `$object_ids` are already cached.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_object_term_cache($object_ids, $object_type) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($object_ids) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3981,7 +3979,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * track of found terms when recursing the hierarchy. The array of located ancestors is used
</span><span class="cx" style="display: block; padding: 0 10px"> * to prevent infinite recursion loops. For performance, `term_ids` are used as array keys,
</span><span class="cx" style="display: block; padding: 0 10px"> * with 1 as value. Default empty array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array The subset of $terms that are descendants of $term_id.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array|WP_Error The subset of $terms that are descendants of $term_id.
</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, $terms, $taxonomy, &$ancestors = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $empty_array = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4045,7 +4043,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $terms List of term IDs, passed by reference.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Term context.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return null Will break from function if conditions are not met.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _pad_term_counts( &$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">@@ -4116,7 +4113,7 @@
</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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of Term taxonomy IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $taxonomy Current taxonomy object of terms.
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4165,7 +4162,7 @@
</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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $terms List of term taxonomy IDs.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object $taxonomy Current taxonomy object of terms.
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4189,6 +4186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_id ID of the shared term.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_taxonomy_id ID of the term_taxonomy item to receive a new term.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error When the current term does not need to be split (or cannot be split on the current
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4310,6 +4309,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_id ID of the formerly shared term.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $new_term_id ID of the new term created for the $term_taxonomy_id.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4362,9 +4363,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $old_term_id Term ID. This is the old, pre-split term ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy that the term belongs to.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool|int If a previously split term is found corresponding to the old term_id and taxonomy,
- * the new term_id will be returned. If no previously split term is found matching
- * the parameters, returns false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int|false If a previously split term is found corresponding to the old term_id and taxonomy,
+ * the new term_id will be returned. If no previously split term is found matching
+ * the parameters, returns false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_split_term( $old_term_id, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $split_terms = wp_get_split_terms( $old_term_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4383,6 +4384,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"> * @since 4.3.0 Introduced `$field` argument.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Rewrite $wp_rewrite
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param object|int|string $term The term object, ID, or slug whose link will be retrieved.
</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"> * @param string $field Optional. The term field that should be matched by the `$term` argument. Accepts
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4656,16 +4659,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Single taxonomy name.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function is_object_in_taxonomy($object_type, $taxonomy) {
- $taxonomies = get_object_taxonomies($object_type);
-
- if ( empty($taxonomies) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function is_object_in_taxonomy( $object_type, $taxonomy ) {
+ $taxonomies = get_object_taxonomies( $object_type );
+ if ( empty( $taxonomies ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( in_array($taxonomy, $taxonomies) )
- return true;
-
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ return in_array( $taxonomy, $taxonomies );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4731,12 +4730,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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"> * @param string $taxonomy Taxonomy name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return int|bool False on error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int|false 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$term || is_wp_error( $term ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $term || is_wp_error( $term ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) $term->parent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>