<!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>[12326] trunk/wp-includes/media.php: Cleanup oembed caching.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12326">12326</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-06 17:40:36 +0000 (Sun, 06 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup oembed caching. Props Viper007Bond. see <a href="http://trac.wordpress.org/ticket/10337">#10337</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12325 => 12326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2009-12-06 17:33:53 UTC (rev 12325)
+++ trunk/wp-includes/media.php 2009-12-06 17:40:36 UTC (rev 12326)
</span><span class="lines">@@ -1038,7 +1038,7 @@
</span><span class="cx"> * @return string The embed HTML on success, otherwise the original URL.
</span><span class="cx"> */
</span><span class="cx"> function shortcode( $attr, $url = '' ) {
</span><del>- global $post, $_wp_using_ext_object_cache;
</del><ins>+ global $post;
</ins><span class="cx">
</span><span class="cx"> if ( empty($url) )
</span><span class="cx"> return '';
</span><span class="lines">@@ -1065,9 +1065,9 @@
</span><span class="cx"> if ( $post_ID ) {
</span><span class="cx">
</span><span class="cx"> // Check for a cached result (stored in the post meta)
</span><del>- $cachekey = '_oembed_' . md5( $url . implode( '|', $attr ) );
</del><ins>+ $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
</ins><span class="cx"> if ( $this->usecache ) {
</span><del>- $cache = ( $_wp_using_ext_object_cache ) ? wp_cache_get( "{$post_ID}_{$cachekey}", 'oembed' ) : get_post_meta( $post_ID, $cachekey, true );
</del><ins>+ $cache = get_post_meta( $post_ID, $cachekey, true );
</ins><span class="cx">
</span><span class="cx"> // Failures are cached
</span><span class="cx"> if ( '{{unknown}}' === $cache )
</span><span class="lines">@@ -1083,10 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> // Cache the result
</span><span class="cx"> $cache = ( $html ) ? $html : '{{unknown}}';
</span><del>- if ( $_wp_using_ext_object_cache )
- wp_cache_set( "{$post_ID}_{$cachekey}", $cache, 'oembed' );
- else
- update_post_meta( $post_ID, $cachekey, $cache );
</del><ins>+ update_post_meta( $post_ID, $cachekey, $cache );
</ins><span class="cx">
</span><span class="cx"> // If there was a result, return it
</span><span class="cx"> if ( $html )
</span><span class="lines">@@ -1106,7 +1103,8 @@
</span><span class="cx"> $post_metas = get_post_custom_keys( $post_ID );
</span><span class="cx"> if ( empty($post_metas) )
</span><span class="cx"> return;
</span><del>- foreach( (array) $post_metas as $post_meta_key ) {
</del><ins>+
+ foreach( $post_metas as $post_meta_key ) {
</ins><span class="cx"> if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
</span><span class="cx"> delete_post_meta( $post_ID, $post_meta_key );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>