<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12510] trunk/wp-includes/taxonomy.php: Cleanup clean_term_cache().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12510">12510</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-23 14:37:21 +0000 (Wed, 23 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup clean_term_cache(). Props Denis-de-Bernardy. see <a href="http://trac.wordpress.org/ticket/11530">#11530</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (12509 => 12510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2009-12-23 14:25:09 UTC (rev 12509)
+++ trunk/wp-includes/taxonomy.php 2009-12-23 14:37:21 UTC (rev 12510)
</span><span class="lines">@@ -1860,18 +1860,23 @@
</span><span class="cx"> $taxonomies = array();
</span><span class="cx"> // If no taxonomy, assume tt_ids.
</span><span class="cx"> if ( empty($taxonomy) ) {
</span><del>- $tt_ids = implode(', ', $ids);
</del><ins>+ $tt_ids = array_map('intval', $ids);
+ $tt_ids = implode(', ', $tt_ids);
</ins><span class="cx"> $terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
</span><ins>+ $ids = array();
</ins><span class="cx"> foreach ( (array) $terms as $term ) {
</span><span class="cx"> $taxonomies[] = $term->taxonomy;
</span><ins>+ $ids[] = $term->term_id;
</ins><span class="cx"> wp_cache_delete($term->term_id, $term->taxonomy);
</span><span class="cx"> }
</span><span class="cx"> $taxonomies = array_unique($taxonomies);
</span><span class="cx"> } else {
</span><del>- foreach ( $ids as $id ) {
- wp_cache_delete($id, $taxonomy);
</del><ins>+ $taxonomies = array($taxonomy);
+ foreach ( $taxonomies as $taxonomy ) {
+ foreach ( $ids as $id ) {
+ wp_cache_delete($id, $taxonomy);
+ }
</ins><span class="cx"> }
</span><del>- $taxonomies = array($taxonomy);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( $taxonomies as $taxonomy ) {
</span><span class="lines">@@ -1881,11 +1886,10 @@
</span><span class="cx"> wp_cache_delete('all_ids', $taxonomy);
</span><span class="cx"> wp_cache_delete('get', $taxonomy);
</span><span class="cx"> delete_option("{$taxonomy}_children");
</span><ins>+ do_action('clean_term_cache', $ids, $taxonomy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> wp_cache_set('last_changed', time(), 'terms');
</span><del>-
- do_action('clean_term_cache', $ids, $taxonomy);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>