WP Merge to rev 8216

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

3 files changed, 11 insertions, 9 deletions

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index cf530d4..99f2bbd 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -330,8 +330,6 @@ function media_sideload_image($file, $post_id, $desc = null) {
 	}
 
 	if ( !empty($src) ) {
-		if ( !strpos($src, '://') )
-			$src = "http://$src";
 		$alt = @$desc;
 		$html = "<img src='$src' alt='$alt' />";
 		return $html;
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 64b2eaf..3d15013 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -330,8 +330,8 @@ function populate_options() {
 
 	// 2.6
 	add_option('avatar_default', 'mystery');
-	add_option('enable_app',0);
-	add_option('enable_xmlrpc',0);
+	add_option('enable_app', 0);
+	add_option('enable_xmlrpc', 0);
 	
 	// Delete unused options
 	$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');
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