Merged in release/release-1.09 (pull request #10)
Release/release 1.09 * Install missing plugins * rs set to 1 * rebase pantheon for aws * rebase pantheon for aws * prod config change * prod config change * fix campaing issue * revert Approved-by: Jay Sharma
This commit is contained in:
committed by
Jay Sharma
parent
779393381f
commit
22f10a9edd
@@ -491,6 +491,8 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
|
||||
* @global array $_wp_switched_stack
|
||||
* @global bool $switched
|
||||
* @global string $table_prefix
|
||||
* @global string $wp_template_path
|
||||
* @global string $wp_stylesheet_path
|
||||
* @global WP_Object_Cache $wp_object_cache
|
||||
*
|
||||
* @param int $new_blog_id The ID of the blog to switch to. Default: current blog.
|
||||
@@ -532,8 +534,10 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
|
||||
}
|
||||
|
||||
$wpdb->set_blog_id( $new_blog_id );
|
||||
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
|
||||
$GLOBALS['blog_id'] = $new_blog_id;
|
||||
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
|
||||
$GLOBALS['blog_id'] = $new_blog_id;
|
||||
$GLOBALS['wp_template_path'] = null;
|
||||
$GLOBALS['wp_stylesheet_path'] = null;
|
||||
|
||||
if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
|
||||
wp_cache_switch_to_blog( $new_blog_id );
|
||||
@@ -600,6 +604,8 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
|
||||
* @global int $blog_id
|
||||
* @global bool $switched
|
||||
* @global string $table_prefix
|
||||
* @global string $wp_template_path
|
||||
* @global string $wp_stylesheet_path
|
||||
* @global WP_Object_Cache $wp_object_cache
|
||||
*
|
||||
* @return bool True on success, false if we're already on the current blog.
|
||||
@@ -625,8 +631,10 @@ function restore_current_blog() {
|
||||
}
|
||||
|
||||
$wpdb->set_blog_id( $new_blog_id );
|
||||
$GLOBALS['blog_id'] = $new_blog_id;
|
||||
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
|
||||
$GLOBALS['blog_id'] = $new_blog_id;
|
||||
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
|
||||
$GLOBALS['wp_template_path'] = null;
|
||||
$GLOBALS['wp_stylesheet_path'] = null;
|
||||
|
||||
if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
|
||||
wp_cache_switch_to_blog( $new_blog_id );
|
||||
|
||||
Reference in New Issue
Block a user