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

Resurrect the switched global. Some are still using it. see #21459 

git-svn-id: http://core.svn.wordpress.org/trunk@21581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-08-22 03:34:00 +00:00
parent 4ce88d3d0f
commit f11317881a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/ms-blogs.php
View File

@ -462,7 +462,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
* the extra unnecessary work */ * the extra unnecessary work */
if ( $new_blog == $GLOBALS['blog_id'] ) { if ( $new_blog == $GLOBALS['blog_id'] ) {
do_action( 'switch_blog', $new_blog, $new_blog ); do_action( 'switch_blog', $new_blog, $new_blog );
$GLOBALS['_wp_switched'] = true; $GLOBALS['switched'] = true;
return true; return true;
} }
@ -499,7 +499,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
} }
do_action( 'switch_blog', $new_blog, $prev_blog_id ); do_action( 'switch_blog', $new_blog, $prev_blog_id );
$GLOBALS['_wp_switched'] = true; $GLOBALS['switched'] = true;
return true; return true;
} }
@ -515,7 +515,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
function restore_current_blog() { function restore_current_blog() {
global $wpdb, $wp_roles; global $wpdb, $wp_roles;
if ( ! $GLOBALS['_wp_switched'] ) if ( ! $GLOBALS['switched'] )
return false; return false;
$blog = array_pop( $GLOBALS['_wp_switched_stack'] ); $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
@ -523,7 +523,7 @@ function restore_current_blog() {
if ( $GLOBALS['blog_id'] == $blog ) { if ( $GLOBALS['blog_id'] == $blog ) {
do_action( 'switch_blog', $blog, $blog ); do_action( 'switch_blog', $blog, $blog );
// If we still have items in the switched stack, consider ourselves still 'switched' // If we still have items in the switched stack, consider ourselves still 'switched'
$GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] ); $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
return true; return true;
} }
@ -562,7 +562,7 @@ function restore_current_blog() {
do_action( 'switch_blog', $blog, $prev_blog_id ); do_action( 'switch_blog', $blog, $prev_blog_id );
// If we still have items in the switched stack, consider ourselves still 'switched' // If we still have items in the switched stack, consider ourselves still 'switched'
$GLOBALS['_wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] ); $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
return true; return true;
} }
@ -575,7 +575,7 @@ function restore_current_blog() {
* @return bool True if switched, false otherwise. * @return bool True if switched, false otherwise.
*/ */
function ms_is_switched() { function ms_is_switched() {
return $GLOBALS['_wp_switched']; return $GLOBALS['switched'];
} }
/** /**

2
wp-includes/ms-settings.php
View File

@ -127,7 +127,7 @@ $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunris
$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id ); $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
$table_prefix = $wpdb->get_blog_prefix(); $table_prefix = $wpdb->get_blog_prefix();
$_wp_switched_stack = array(); $_wp_switched_stack = array();
$_wp_switched = false; $switched = false;
// need to init cache again after blog_id is set // need to init cache again after blog_id is set
wp_start_object_cache(); wp_start_object_cache();