Changeset 24091

Timestamp:

04/25/2013 07:10:35 AM (13 years ago)

Author:

markjaquith

Message:

Smarter structured post format caching.

fixes #24002. props kovshenin, wonderboymusic.

File:

• trunk/wp-includes/media.php (modified) (10 diffs)

trunk/wp-includes/media.php

@@ -2064 +2064 @@
                 return '';
 
-        if ( isset( $post->format_content ) )
-                return $post->format_content;
+        $cache_key = "media:{$type}";
+
+        if ( isset( $post->format_content[ $cache_key ] ) )
+                return $post->format_content[ $cache_key ];
+
+        if ( ! isset( $post->format_content ) )
+                $post->format_content = array();
 
         $count = 1;
@@ -2079 +2084 @@
                                 $shortcode = $value;
                         } elseif ( preg_match( '#<[^>]+>#', $value ) ) {
-                                $post->format_content = $value;
-                                return $post->format_content;
+                                $post->format_content[ $cache_key ] = $value;
+                                return $post->format_content[ $cache_key ];
                         } elseif ( 0 === strpos( $value, 'http' ) ) {
                                 $post->split_content = str_replace( $value, '', $post->post_content, $count );
@@ -2086 +2091 @@
                                         $shortcode = sprintf( '[%s src="%s"]', $type, $value );
                                 } else {
-                                        $post->format_content = $wp_embed->autoembed( $value );
-                                        return $post->format_content;
+                                        $post->format_content[ $cache_key ] = $wp_embed->autoembed( $value );
+                                        return $post->format_content[ $cache_key ];
                                 }
                         }
 
                         if ( ! empty( $shortcode ) ) {
-                                $post->format_content = do_shortcode( $shortcode );
-                                return $post->format_content;
+                                $post->format_content[ $cache_key ] = do_shortcode( $shortcode );
+                                return $post->format_content[ $cache_key ];
                         }
                 }
@@ -2105 +2110 @@
                 $html = reset( $htmls );
                 $post->split_content = $content;
-                $post->format_content = $html;
-                return $post->format_content;
+                $post->format_content[ $cache_key ] = $html;
+                return $post->format_content[ $cache_key ];
         }
 
@@ -2115 +2120 @@
                 if ( 0 === strpos( $embed, 'http' ) ) {
                         if ( strstr( $embed, home_url() ) ) {
-                                $post->format_content = do_shortcode( sprintf( '[%s src="%s"]', $type, $embed ) );
+                                $post->format_content[ $cache_key ] = do_shortcode( sprintf( '[%s src="%s"]', $type, $embed ) );
                         } else {
-                                $post->format_content = $wp_embed->autoembed( $embed );
+                                $post->format_content[ $cache_key ] = $wp_embed->autoembed( $embed );
                         }
                 } else {
-                        $post->format_content = $embed;
-                }
-                return $post->format_content;
+                        $post->format_content[ $cache_key ] = $embed;
+                }
+                return $post->format_content[ $cache_key ];
         }
 
@@ -2130 +2135 @@
                 $url = wp_get_attachment_url( $media->ID );
                 $shortcode = sprintf( '[%s src="%s"]', $type, $url );
-                $post->format_content = do_shortcode( $shortcode );
-                return $post->format_content;
+                $post->format_content[ $cache_key ] = do_shortcode( $shortcode );
+                return $post->format_content[ $cache_key ];
         }
 
@@ -2409 +2414 @@
                 return '';
 
-        if ( isset( $post->format_content ) && false !== strpos( $post->format_content, 'attachment-' . $attached_size ) )
-                return $post->format_content;
+        $cache_key = "image:{$attached_size}";
+
+        if ( isset( $post->format_content[ $cache_key ] ) )
+                return $post->format_content[ $cache_key ];
+
+        if ( ! isset( $post->format_content ) )
+                $post->format_content = array();
 
         $matched = false;
@@ -2444 +2454 @@
 
                 if ( false === strpos( $image, '<a ' ) )
-                        $post->format_content = sprintf( $link_fmt, $image );
+                        $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
                 else
-                        $post->format_content = $image;
-                return $post->format_content;
+                        $post->format_content[ $cache_key ] = $image;
+                return $post->format_content[ $cache_key ];
         }
 
@@ -2501 +2511 @@
                 if ( ! $matched ) {
                         $image = wp_get_attachment_image( $media->ID, $attached_size );
-                        $post->format_content = sprintf( $link_fmt, $image );
+                        $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
                 } else {
-                        $post->format_content = $matched;
+                        $post->format_content[ $cache_key ] = $matched;
                         if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
-                                $post->format_content = sprintf( $link_fmt, $matched );
-                }
-                return $post->format_content;
+                                $post->format_content[ $cache_key ] = sprintf( $link_fmt, $matched );
+                }
+                return $post->format_content[ $cache_key ];
         }
 
@@ -2515 +2525 @@
                 $html = reset( $htmls );
                 $post->split_content = $content;
-                $post->format_content = sprintf( $link_fmt, $html );
-                return $post->format_content;
+                $post->format_content[ $cache_key ] = sprintf( $link_fmt, $html );
+                return $post->format_content[ $cache_key ];
         }
 }