golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup oembed caching. Props Viper007Bond. see #10337 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-12-06 17:40:36 +00:00
parent 0b106b0808
commit ba3275b123
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/media.php
View File

@ -1038,7 +1038,7 @@ class WP_Embed {
* @return string The embed HTML on success, otherwise the original URL. * @return string The embed HTML on success, otherwise the original URL.
*/ */
function shortcode( $attr, $url = '' ) { function shortcode( $attr, $url = '' ) {
global $post, $_wp_using_ext_object_cache; global $post;
if ( empty($url) ) if ( empty($url) )
return ''; return '';
@ -1065,9 +1065,9 @@ class WP_Embed {
if ( $post_ID ) { if ( $post_ID ) {
// Check for a cached result (stored in the post meta) // 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 ) { 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 // Failures are cached
if ( '{{unknown}}' === $cache ) if ( '{{unknown}}' === $cache )
@ -1083,10 +1083,7 @@ class WP_Embed {
// Cache the result // Cache the result
$cache = ( $html ) ? $html : '{{unknown}}'; $cache = ( $html ) ? $html : '{{unknown}}';
if ( $_wp_using_ext_object_cache ) update_post_meta( $post_ID, $cachekey, $cache );
wp_cache_set( "{$post_ID}_{$cachekey}", $cache, 'oembed' );
else
update_post_meta( $post_ID, $cachekey, $cache );
// If there was a result, return it // If there was a result, return it
if ( $html ) if ( $html )
@ -1106,7 +1103,8 @@ class WP_Embed {
$post_metas = get_post_custom_keys( $post_ID ); $post_metas = get_post_custom_keys( $post_ID );
if ( empty($post_metas) ) if ( empty($post_metas) )
return; return;
foreach( (array) $post_metas as $post_meta_key ) {
foreach( $post_metas as $post_meta_key ) {
if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) ) if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
delete_post_meta( $post_ID, $post_meta_key ); delete_post_meta( $post_ID, $post_meta_key );
} }