<!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>[24091] trunk/wp-includes/media.php: Smarter structured post format caching.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24091">24091</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-25 07:10:35 +0000 (Thu, 25 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Smarter structured post format caching.
fixes <a href="http://core.trac.wordpress.org/ticket/24002">#24002</a>. props kovshenin, wonderboymusic.</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 (24090 => 24091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-04-25 06:58:41 UTC (rev 24090)
+++ trunk/wp-includes/media.php 2013-04-25 07:10:35 UTC (rev 24091)
</span><span class="lines">@@ -2063,9 +2063,14 @@
</span><span class="cx"> if ( empty( $post ) )
</span><span class="cx"> return '';
</span><span class="cx">
</span><del>- if ( isset( $post->format_content ) )
- return $post->format_content;
</del><ins>+ $cache_key = "media:{$type}";
</ins><span class="cx">
</span><ins>+ if ( isset( $post->format_content[ $cache_key ] ) )
+ return $post->format_content[ $cache_key ];
+
+ if ( ! isset( $post->format_content ) )
+ $post->format_content = array();
+
</ins><span class="cx"> $count = 1;
</span><span class="cx">
</span><span class="cx"> if ( has_post_format( $type, $post ) ) {
</span><span class="lines">@@ -2078,21 +2083,21 @@
</span><span class="cx"> } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) {
</span><span class="cx"> $shortcode = $value;
</span><span class="cx"> } elseif ( preg_match( '#<[^>]+>#', $value ) ) {
</span><del>- $post->format_content = $value;
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = $value;
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> } elseif ( 0 === strpos( $value, 'http' ) ) {
</span><span class="cx"> $post->split_content = str_replace( $value, '', $post->post_content, $count );
</span><span class="cx"> if ( strstr( $value, home_url() ) ) {
</span><span class="cx"> $shortcode = sprintf( '[%s src="%s"]', $type, $value );
</span><span class="cx"> } else {
</span><del>- $post->format_content = $wp_embed->autoembed( $value );
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = $wp_embed->autoembed( $value );
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $shortcode ) ) {
</span><del>- $post->format_content = do_shortcode( $shortcode );
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = do_shortcode( $shortcode );
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2104,8 +2109,8 @@
</span><span class="cx"> if ( ! empty( $htmls ) ) {
</span><span class="cx"> $html = reset( $htmls );
</span><span class="cx"> $post->split_content = $content;
</span><del>- $post->format_content = $html;
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = $html;
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $embeds = get_embedded_media( $type, $content, true, 1 );
</span><span class="lines">@@ -2114,14 +2119,14 @@
</span><span class="cx"> $post->split_content = $content;
</span><span class="cx"> if ( 0 === strpos( $embed, 'http' ) ) {
</span><span class="cx"> if ( strstr( $embed, home_url() ) ) {
</span><del>- $post->format_content = do_shortcode( sprintf( '[%s src="%s"]', $type, $embed ) );
</del><ins>+ $post->format_content[ $cache_key ] = do_shortcode( sprintf( '[%s src="%s"]', $type, $embed ) );
</ins><span class="cx"> } else {
</span><del>- $post->format_content = $wp_embed->autoembed( $embed );
</del><ins>+ $post->format_content[ $cache_key ] = $wp_embed->autoembed( $embed );
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $post->format_content = $embed;
</del><ins>+ $post->format_content[ $cache_key ] = $embed;
</ins><span class="cx"> }
</span><del>- return $post->format_content;
</del><ins>+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $medias = call_user_func( 'get_attached_' . $type, $post->ID );
</span><span class="lines">@@ -2129,8 +2134,8 @@
</span><span class="cx"> $media = reset( $medias );
</span><span class="cx"> $url = wp_get_attachment_url( $media->ID );
</span><span class="cx"> $shortcode = sprintf( '[%s src="%s"]', $type, $url );
</span><del>- $post->format_content = do_shortcode( $shortcode );
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = do_shortcode( $shortcode );
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return '';
</span><span class="lines">@@ -2408,9 +2413,14 @@
</span><span class="cx"> if ( empty( $post ) )
</span><span class="cx"> return '';
</span><span class="cx">
</span><del>- if ( isset( $post->format_content ) && false !== strpos( $post->format_content, 'attachment-' . $attached_size ) )
- return $post->format_content;
</del><ins>+ $cache_key = "image:{$attached_size}";
</ins><span class="cx">
</span><ins>+ if ( isset( $post->format_content[ $cache_key ] ) )
+ return $post->format_content[ $cache_key ];
+
+ if ( ! isset( $post->format_content ) )
+ $post->format_content = array();
+
</ins><span class="cx"> $matched = false;
</span><span class="cx"> $meta = get_post_format_meta( $post->ID );
</span><span class="cx">
</span><span class="lines">@@ -2443,10 +2453,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( false === strpos( $image, '<a ' ) )
</span><del>- $post->format_content = sprintf( $link_fmt, $image );
</del><ins>+ $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
</ins><span class="cx"> else
</span><del>- $post->format_content = $image;
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = $image;
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $medias = get_attached_images( $post->ID );
</span><span class="lines">@@ -2500,13 +2510,13 @@
</span><span class="cx"> $post->split_content = $content;
</span><span class="cx"> if ( ! $matched ) {
</span><span class="cx"> $image = wp_get_attachment_image( $media->ID, $attached_size );
</span><del>- $post->format_content = sprintf( $link_fmt, $image );
</del><ins>+ $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
</ins><span class="cx"> } else {
</span><del>- $post->format_content = $matched;
</del><ins>+ $post->format_content[ $cache_key ] = $matched;
</ins><span class="cx"> if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
</span><del>- $post->format_content = sprintf( $link_fmt, $matched );
</del><ins>+ $post->format_content[ $cache_key ] = sprintf( $link_fmt, $matched );
</ins><span class="cx"> }
</span><del>- return $post->format_content;
</del><ins>+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $content = $post->post_content;
</span><span class="lines">@@ -2514,8 +2524,8 @@
</span><span class="cx"> if ( ! empty( $htmls ) ) {
</span><span class="cx"> $html = reset( $htmls );
</span><span class="cx"> $post->split_content = $content;
</span><del>- $post->format_content = sprintf( $link_fmt, $html );
- return $post->format_content;
</del><ins>+ $post->format_content[ $cache_key ] = sprintf( $link_fmt, $html );
+ return $post->format_content[ $cache_key ];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>