WP Merge to rev 8216

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1344 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 5 deletions

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 3d5ce74..830a0d6 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -6,7 +6,7 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php');
 require_once(ABSPATH . 'wp-admin/includes/schema.php');
 
 if ( !function_exists('wp_install') ) :
-function wp_install($blog_title, $user_name, $user_email, $public, $remote) {
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
 	global $wp_rewrite;
 
 	wp_check_mysql_version();
@@ -18,8 +18,6 @@ function wp_install($blog_title, $user_name, $user_email, $public, $remote) {
 	update_option('blogname', $blog_title);
 	update_option('admin_email', $user_email);
 	update_option('blog_public', $public);
-	update_option('enable_app',$remote);
-	update_option('enable_xmlrpc',$remote);
 
 	$guessurl = wp_guess_url();
 
@@ -206,7 +204,7 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 7935 )
 		upgrade_252();
 
-	if ( $wp_current_db_version < 8000 )
+	if ( $wp_current_db_version < 8201 )
 		upgrade_260();
 
 	maybe_disable_automattic_widgets();
@@ -752,7 +750,13 @@ function upgrade_252() {
 }
 
 function upgrade_260() {
-	populate_roles_260();
+	if ( $wp_current_db_version < 8000 )
+		populate_roles_260();
+
+	if ( $wp_current_db_version < 8201 ) {
+		update_option('enable_app', 1);
+		update_option('enable_xmlrpc', 1);
+	}
 }
 
 // The functions we use to actually do stuff