Fix inverted logic in [15331]. see #13934
git-svn-id: http://svn.automattic.com/wordpress/trunk@15332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
6c31f32be1
commit
9a032e6eef
|
@ -407,7 +407,7 @@ function switch_to_blog( $new_blog, $validate = false ) {
|
||||||
$wpdb->suppress_errors( false );
|
$wpdb->suppress_errors( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! did_action('init') ) {
|
if ( did_action('init') ) {
|
||||||
$current_user = wp_get_current_user();
|
$current_user = wp_get_current_user();
|
||||||
if ( is_object( $current_user ) )
|
if ( is_object( $current_user ) )
|
||||||
$current_user->for_blog( $blog_id );
|
$current_user->for_blog( $blog_id );
|
||||||
|
@ -463,7 +463,7 @@ function restore_current_blog() {
|
||||||
$wpdb->suppress_errors( false );
|
$wpdb->suppress_errors( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! did_action('init') ) {
|
if ( did_action('init') ) {
|
||||||
$current_user = wp_get_current_user();
|
$current_user = wp_get_current_user();
|
||||||
if ( is_object( $current_user ) )
|
if ( is_object( $current_user ) )
|
||||||
$current_user->for_blog( $blog_id );
|
$current_user->for_blog( $blog_id );
|
||||||
|
|
Loading…
Reference in New Issue