Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use switch_to_blog()/restore_current_blog() in get_blog_post() and get_blog_permalink(). Eliminate the duplicate caching in these functions. Return WP_Post from get_blog_post(). Update phpdoc. Remove global-posts cache invalidation. Props jondavidjohn fixes #21595 

git-svn-id: http://core.svn.wordpress.org/trunk@21628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-08-27 16:22:45 +00:00
parent af91b41af3
commit 2ea0626e5d
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-includes/ms-functions.php
View File

@ -152,17 +152,12 @@ function get_blog_count( $id = 0 ) {
*
* @param int $blog_id ID of the blog.
* @param int $post_id ID of the post you're looking for.
* @return object The post.
* @return WP_Post|null WP_Post on success or null on failure
*/
function get_blog_post( $blog_id, $post_id ) {
global $wpdb;
$key = $blog_id . '-' . $post_id;
$post = wp_cache_get( $key, 'global-posts' );
if ( $post == false ) {
$post = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . $wpdb->get_blog_prefix( $blog_id ) . 'posts WHERE ID = %d', $post_id ) );
wp_cache_add( $key, $post, 'global-posts' );
}
switch_to_blog( $blog_id );
$post = get_post( $post_id );
restore_current_blog();
return $post;
}
@ -313,19 +308,15 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
*
* @since MU 1.0
*
* @param int $_blog_id ID of the source blog.
* @param int $blog_id ID of the source blog.
* @param int $post_id ID of the desired post.
* @return string The post's permalink
*/
function get_blog_permalink( $_blog_id, $post_id ) {
$key = "{$_blog_id}-{$post_id}-blog_permalink";
$link = wp_cache_get( $key, 'site-options' );
if ( $link == false ) {
switch_to_blog( $_blog_id );
$link = get_permalink( $post_id );
restore_current_blog();
wp_cache_add( $key, $link, 'site-options', 360 );
}
function get_blog_permalink( $blog_id, $post_id ) {
switch_to_blog( $blog_id );
$link = get_permalink( $post_id );
restore_current_blog();
return $link;
}

3
wp-includes/post.php
View File

@ -4517,9 +4517,6 @@ function clean_post_cache( $post ) {
clean_post_cache( $child );
}
}
if ( is_multisite() )
wp_cache_delete( $wpdb->blogid . '-' . $post->ID, 'global-posts' );
}
/**