Changeset 12326

Timestamp:

12/06/2009 05:40:36 PM (17 years ago)

Author:

ryan

Message:

Cleanup oembed caching. Props Viper007Bond. see #10337

File:

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

trunk/wp-includes/media.php

@@ -1039 +1039 @@
          */
         function shortcode( $attr, $url = '' ) {
-                global $post, $_wp_using_ext_object_cache;
+                global $post;
 
                 if ( empty($url) )
@@ -1066 +1066 @@
 
                         // Check for a cached result (stored in the post meta)
-                        $cachekey = '_oembed_' . md5( $url . implode( '|', $attr ) );
+                        $cachekey = '_oembed_' . md5( $url . serialize( $attr ) );
                         if ( $this->usecache ) {
-                                $cache = ( $_wp_using_ext_object_cache ) ? wp_cache_get( "{$post_ID}_{$cachekey}", 'oembed' ) : get_post_meta( $post_ID, $cachekey, true );
+                                $cache = get_post_meta( $post_ID, $cachekey, true );
 
                                 // Failures are cached
@@ -1084 +1084 @@
                         // Cache the result
                         $cache = ( $html ) ? $html : '{{unknown}}';
-                        if ( $_wp_using_ext_object_cache )
-                                wp_cache_set( "{$post_ID}_{$cachekey}", $cache, 'oembed' );
-                        else
-                                update_post_meta( $post_ID, $cachekey, $cache );
+                        update_post_meta( $post_ID, $cachekey, $cache );
 
                         // If there was a result, return it
@@ -1107 +1104 @@
                 if ( empty($post_metas) )
                         return;
-                foreach( (array) $post_metas as $post_meta_key ) {
+
+                foreach( $post_metas as $post_meta_key ) {
                         if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
                                 delete_post_meta( $post_ID, $post_meta_key );