<!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>[60933] trunk: Taxonomy: Bypass clearing taxonomy hierarchy for non-hierarchical taxonomies.</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 { white-space: pre-line; 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/60933">60933</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/60933","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-15 00:40:07 +0000 (Wed, 15 Oct 2025)</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'>Taxonomy: Bypass clearing taxonomy hierarchy for non-hierarchical taxonomies.
Modifies `clean_taxonomy_cache()` to bypass attempting to delete the `{$taxonomy}_children` option for non-hierarchical taxonomies, such as tags.
This removes a needless database query within `delete_option()` to determine if the `{$taxonomy}_children` option is set. It isn't.
Props: chouby, mukesh27, rollybueno, sabernhardt, shailu25, spacedmonkey, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/64090">#64090</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststaxonomycleanTaxonomyCachephp">trunk/tests/phpunit/tests/taxonomy/cleanTaxonomyCache.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 2025-10-14 10:13:41 UTC (rev 60932)
+++ trunk/src/wp-includes/taxonomy.php 2025-10-15 00:40:07 UTC (rev 60933)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3732,8 +3732,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set_terms_last_changed();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Regenerate cached hierarchy.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_option( "{$taxonomy}_children" );
- _get_term_hierarchy( $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+ delete_option( "{$taxonomy}_children" );
+ _get_term_hierarchy( $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"> * Fires after a taxonomy's caches have been cleaned.
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomycleanTaxonomyCachephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/taxonomy/cleanTaxonomyCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy/cleanTaxonomyCache.php (rev 0)
+++ trunk/tests/phpunit/tests/taxonomy/cleanTaxonomyCache.php 2025-10-15 00:40:07 UTC (rev 60933)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,74 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group taxonomy
+ *
+ * @covers ::clean_taxonomy_cache
+ */
+class Tests_Taxonomy_CleanTaxonomyCache extends WP_UnitTestCase {
+ /**
+ * Ensure clearing the cache of a non-hierarchical taxonomy doesn't attempt to delete the hierarchy cache.
+ *
+ * @ticket 64090
+ */
+ public function test_hierarchy_cache_not_cleared_for_non_hierarchical_taxonomy() {
+ // Prime the tag cache by inserting terms.
+ wp_insert_term( 'foo', 'post_tag' );
+
+ /*
+ * Determine if delete_option( "{$taxonomy}_children" ) is called.
+ *
+ * None of the actions in delete_option() or _get_term_hierarchy() fire for
+ * non-hierarchical taxonomies, so the query filter needs to be used to determine
+ * if an attempt to delete the option was made.
+ */
+ $delete_post_tag_children_called = false;
+ add_filter(
+ 'query',
+ static function ( $query ) use ( &$delete_post_tag_children_called ) {
+ global $wpdb;
+ if ( "SELECT autoload FROM $wpdb->options WHERE option_name = 'post_tag_children'" === $query ) {
+ $delete_post_tag_children_called = true;
+ }
+ return $query;
+ }
+ );
+
+ clean_taxonomy_cache( 'post_tag' );
+
+ $this->assertFalse( $delete_post_tag_children_called, 'An attempt to clear the post_tag_children option should not be made.' );
+ }
+
+ /**
+ * Ensure clearing the cache of a hierarchical taxonomy does attempt to delete the hierarchy cache.
+ *
+ * @ticket 64090
+ */
+ public function test_hierarchy_cache_cleared_for_hierarchical_taxonomy() {
+ // Prime the category cache by inserting terms.
+ wp_insert_term( 'foo', 'category' );
+
+ /*
+ * Determine if delete_option( "{$taxonomy}_children" ) is called.
+ *
+ * None of the actions in delete_option() or _get_term_hierarchy() fire for
+ * non-hierarchical taxonomies, so the query filter needs to be used to determine
+ * if an attempt to delete the option was made.
+ */
+ $delete_category_children_called = false;
+ add_filter(
+ 'query',
+ static function ( $query ) use ( &$delete_category_children_called ) {
+ global $wpdb;
+ if ( "SELECT autoload FROM $wpdb->options WHERE option_name = 'category_children'" === $query ) {
+ $delete_category_children_called = true;
+ }
+ return $query;
+ }
+ );
+
+ clean_taxonomy_cache( 'category' );
+
+ $this->assertTrue( $delete_category_children_called, 'An attempt to clear the category_children option should be made.' );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/taxonomy/cleanTaxonomyCache.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>