summaryrefslogtreecommitdiffstats
path: root/wp-includes/wpmu-functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'wp-includes/wpmu-functions.php')
-rw-r--r--wp-includes/wpmu-functions.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index afffd2c..b523754 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -414,7 +414,11 @@ function restore_current_blog() {
unset( $tmpoldblogdetails );
wp_cache_flush();
wp_cache_close();
- $wp_roles->_init();
+ if( is_object( $wp_roles ) ) {
+ $wpdb->hide_errors();
+ $wp_roles->_init();
+ $wpdb->show_errors();
+ }
wp_cache_init();
do_action('switch_blog', $blog_id, $prev_blog_id);