diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-28 19:49:39 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-28 19:49:39 +0000 |
| commit | a09981a5000dc0f77780c9aaeec634a240941a47 (patch) | |
| tree | d684ccc3aacc35ee17debc23968d6732fe330935 /wp-includes/wpmu-functions.php | |
| parent | c3c2bde60913254bc9b4ed1b45df7bd55ff691e7 (diff) | |
| download | wordpress-mu-a09981a5000dc0f77780c9aaeec634a240941a47.tar.gz wordpress-mu-a09981a5000dc0f77780c9aaeec634a240941a47.tar.xz wordpress-mu-a09981a5000dc0f77780c9aaeec634a240941a47.zip | |
Forgot to add the check for $wp_roles in restore_blog.. (#50)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@615 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/wpmu-functions.php')
| -rw-r--r-- | wp-includes/wpmu-functions.php | 6 |
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); |