<!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>[19678] trunk: Introduce term_is_ancestor_of().</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, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19678">19678</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-01-04 22:44:19 +0000 (Wed, 04 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce term_is_ancestor_of(). Finish taxonomy support for wp_insert_category(). Props garyc40. fixes <a href="http://core.trac.wordpress.org/ticket/15581">#15581</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestaxonomyphp">trunk/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludescategoryphp">trunk/wp-includes/category.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/taxonomy.php (19677 => 19678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/taxonomy.php 2012-01-04 20:05:39 UTC (rev 19677)
+++ trunk/wp-admin/includes/taxonomy.php 2012-01-04 22:44:19 UTC (rev 19678)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> if ( $parent < 0 )
</span><span class="cx"> $parent = 0;
</span><span class="cx">
</span><del>- if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
</del><ins>+ if ( empty( $parent ) || ! term_exists( $parent, $taxonomy ) || ( $cat_ID && term_is_ancestor_of( $cat_ID, $parent, $taxonomy ) ) )
</ins><span class="cx"> $parent = 0;
</span><span class="cx">
</span><span class="cx"> $args = compact('name', 'slug', 'parent', 'description');
</span></span></pre></div>
<a id="trunkwpincludescategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category.php (19677 => 19678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category.php 2012-01-04 20:05:39 UTC (rev 19677)
+++ trunk/wp-includes/category.php 2012-01-04 22:44:19 UTC (rev 19678)
</span><span class="lines">@@ -207,20 +207,9 @@
</span><span class="cx"> * @return bool Whether $cat2 is child of $cat1
</span><span class="cx"> */
</span><span class="cx"> function cat_is_ancestor_of( $cat1, $cat2 ) {
</span><del>- if ( ! isset($cat1->term_id) )
- $cat1 = &get_category( $cat1 );
- if ( ! isset($cat2->parent) )
- $cat2 = &get_category( $cat2 );
-
- if ( empty($cat1->term_id) || empty($cat2->parent) )
- return false;
- if ( $cat2->parent == $cat1->term_id )
- return true;
-
- return cat_is_ancestor_of( $cat1, get_category( $cat2->parent ) );
</del><ins>+ return term_is_ancestor_of( $cat1, $cat2, 'category' );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Sanitizes category data based on context.
</span><span class="cx"> *
</span><span class="lines">@@ -235,7 +224,6 @@
</span><span class="cx"> return sanitize_term( $category, 'category', $context );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Sanitizes data in single category key field.
</span><span class="cx"> *
</span><span class="lines">@@ -254,7 +242,6 @@
</span><span class="cx">
</span><span class="cx"> /* Tags */
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Retrieves all post tags.
</span><span class="cx"> *
</span><span class="lines">@@ -277,7 +264,6 @@
</span><span class="cx"> return $tags;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Retrieve post tag by tag ID or tag object.
</span><span class="cx"> *
</span><span class="lines">@@ -301,10 +287,8 @@
</span><span class="cx"> return get_term( $tag, 'post_tag', $output, $filter );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* Cache */
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Remove the category cache data based on ID.
</span><span class="cx"> *
</span><span class="lines">@@ -317,7 +301,6 @@
</span><span class="cx"> clean_term_cache( $id, 'category' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * Update category structure to old pre 2.3 from new taxonomy structure.
</span><span class="cx"> *
</span><span class="lines">@@ -355,5 +338,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (19677 => 19678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2012-01-04 20:05:39 UTC (rev 19677)
+++ trunk/wp-includes/taxonomy.php 2012-01-04 22:44:19 UTC (rev 19678)
</span><span class="lines">@@ -1495,6 +1495,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Check if a term is an ancestor of another term.
+ *
+ * You can use either an id or the term object for both parameters.
+ *
+ * @since 3.4.0
+ *
+ * @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
+ */
+function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
+ if ( ! isset( $term1->term_id ) )
+ $term1 = get_term( $term1, $taxonomy );
+ if ( ! isset( $term2->parent ) )
+ $term2 = get_term( $term2, $taxonomy );
+
+ if ( empty( $term1->term_id ) || empty( $term2->parent ) )
+ return false;
+ if ( $term2->parent == $term1->term_id )
+ return true;
+
+ return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
+}
+
+/**
</ins><span class="cx"> * Sanitize Term all fields.
</span><span class="cx"> *
</span><span class="cx"> * Relies on sanitize_term_field() to sanitize the term. The difference is that
</span></span></pre>
</div>
</div>
</body>
</html>