<!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>[13192] trunk: Clean attachment cache when reattaching, fixes #11647</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13192">13192</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-02-18 07:43:35 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean attachment cache when reattaching, fixes <a href="http://trac.wordpress.org/ticket/11647">#11647</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (13191 => 13192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-02-18 05:14:48 UTC (rev 13191)
+++ trunk/wp-admin/upload.php 2010-02-18 07:43:35 UTC (rev 13192)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $attach[] = $att_id;
</span><ins>+ clean_attachment_cache($att_id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty($attach) ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13191 => 13192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-18 05:14:48 UTC (rev 13191)
+++ trunk/wp-includes/post.php 2010-02-18 07:43:35 UTC (rev 13192)
</span><span class="lines">@@ -3906,6 +3906,41 @@
</span><span class="cx"> return update_meta_cache('post', $post_ids);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Will clean the attachment in the cache.
+ *
+ * Cleaning means delete from the cache. Optionaly will clean the term
+ * object cache associated with the attachment ID.
+ *
+ * This function will not run if $_wp_suspend_cache_invalidation is not empty. See
+ * wp_suspend_cache_invalidation().
+ *
+ * @package WordPress
+ * @subpackage Cache
+ * @since 3.0
+ *
+ * @uses do_action() Calls 'clean_attachment_cache' on $id.
+ *
+ * @param int $id The attachment ID in the cache to clean
+ * @param bool $clean_terms optional. Whether to clean terms cache
+ */
+function clean_attachment_cache($id, $clean_terms = false) {
+ global $_wp_suspend_cache_invalidation, $wpdb;
+
+ if ( !empty($_wp_suspend_cache_invalidation) )
+ return;
+
+ $id = (int) $id;
+
+ wp_cache_delete($id, 'posts');
+ wp_cache_delete($id, 'post_meta');
+
+ if ( $clean_terms )
+ clean_object_term_cache($id, 'attachment');
+
+ do_action('clean_attachment_cache', $id);
+}
+
</ins><span class="cx"> //
</span><span class="cx"> // Hooks
</span><span class="cx"> //
</span></span></pre>
</div>
</div>
</body>
</html>