Changeset 21581
- Timestamp:
- 08/22/2012 03:34:00 AM (12 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/ms-blogs.php
r21561 r21581 463 463 if ( $new_blog == $GLOBALS['blog_id'] ) { 464 464 do_action( 'switch_blog', $new_blog, $new_blog ); 465 $GLOBALS[' _wp_switched'] = true;465 $GLOBALS['switched'] = true; 466 466 return true; 467 467 } … … 500 500 501 501 do_action( 'switch_blog', $new_blog, $prev_blog_id ); 502 $GLOBALS[' _wp_switched'] = true;502 $GLOBALS['switched'] = true; 503 503 504 504 return true; … … 516 516 global $wpdb, $wp_roles; 517 517 518 if ( ! $GLOBALS[' _wp_switched'] )518 if ( ! $GLOBALS['switched'] ) 519 519 return false; 520 520 … … 524 524 do_action( 'switch_blog', $blog, $blog ); 525 525 // If we still have items in the switched stack, consider ourselves still 'switched' 526 $GLOBALS[' _wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );526 $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] ); 527 527 return true; 528 528 } … … 563 563 564 564 // If we still have items in the switched stack, consider ourselves still 'switched' 565 $GLOBALS[' _wp_switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );565 $GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] ); 566 566 567 567 return true; … … 576 576 */ 577 577 function ms_is_switched() { 578 return $GLOBALS[' _wp_switched'];578 return $GLOBALS['switched']; 579 579 } 580 580 -
trunk/wp-includes/ms-settings.php
r21485 r21581 128 128 $table_prefix = $wpdb->get_blog_prefix(); 129 129 $_wp_switched_stack = array(); 130 $ _wp_switched = false;130 $switched = false; 131 131 132 132 // need to init cache again after blog_id is set
Note: See TracChangeset
for help on using the changeset viewer.