site_iri: comparison web/wp-admin/includes/upgrade.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 /**
 * Installs the blog
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.1.0
 *
 * @param string $blog_title Blog title.
 * @param string $user_name User's username.
 * @param string $user_email User's email.
 * @param bool $public Whether blog is public.
 * @param null $deprecated Optional. Not used.
+* @param string $user_password Optional. User's chosen password. Will default to a random password.
 * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
 */
-function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='') {
+function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
-	global $wp_rewrite;
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '2.6' );
 	wp_check_mysql_version();
 	wp_cache_flush();
 	make_db_current_silent();
 	populate_options();
 	// If not a public blog, don't ping.
 	if ( ! $public )
 		update_option('default_pingback_flag', 0);
-	// Create default user.  If the user already exists, the user tables are
+	// Create default user. If the user already exists, the user tables are
-	// being shared among blogs.  Just set the role in that case.
+	// being shared among blogs. Just set the role in that case.
 	$user_id = username_exists($user_name);
-	if ( !$user_id ) {
+	$user_password = trim($user_password);
-		$random_password = wp_generate_password();
+	$email_password = false;
+	if ( !$user_id && empty($user_password) ) {
+		$user_password = wp_generate_password( 12, false );
 		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
-		$user_id = wp_create_user($user_name, $random_password, $user_email);
+		$user_id = wp_create_user($user_name, $user_password, $user_email);
-		update_usermeta($user_id, 'default_password_nag', true);
+		update_user_option($user_id, 'default_password_nag', true, true);
+		$email_password = true;
+	} else if ( !$user_id ) {
+		// Password has been provided
+		$message = '<em>'.__('Your chosen password.').'</em>';
+		$user_id = wp_create_user($user_name, $user_password, $user_email);
 	} else {
-		$random_password = '';
+		$message = __('User already exists. Password inherited.');
-		$message =  __('User already exists.  Password inherited.');
 	}
 	$user = new WP_User($user_id);
 	$user->set_role('administrator');
 	wp_install_defaults($user_id);
-	$wp_rewrite->flush_rules();
+	flush_rewrite_rules();
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, $random_password);
+	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
 	wp_cache_flush();
-	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $random_password, 'password_message' => $message);
+	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
 if ( !function_exists('wp_install_defaults') ) :
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.1.0
 *
 * @param int $user_id User ID.
 */
 function wp_install_defaults($user_id) {
-	global $wpdb;
+	global $wpdb, $wp_rewrite, $current_site, $table_prefix;
 	// Default category
 	$cat_name = __('Uncategorized');
 	/* translators: Default category slug */
 	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
-	$wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+	if ( global_terms_enabled() ) {
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '1', 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+		$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+		if ( $cat_id == null ) {
+			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+			$cat_id = $wpdb->insert_id;
+		}
+		update_option('default_category', $cat_id);
+	} else {
+		$cat_id = 1;
+	}
+	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+	$cat_tt_id = $wpdb->insert_id;
 	// Default link category
 	$cat_name = __('Blogroll');
 	/* translators: Default link category slug */
 	$cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
-	$wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+	if ( global_terms_enabled() ) {
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '2', 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+		$blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
+		if ( $blogroll_id == null ) {
+			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+			$blogroll_id = $wpdb->insert_id;
+		}
+		update_option('default_link_category', $blogroll_id);
+	} else {
+		$blogroll_id = 2;
+	}
+	$wpdb->insert( $wpdb->terms, array('term_id' => $blogroll_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
+	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $blogroll_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+	$blogroll_tt_id = $wpdb->insert_id;
 	// Now drop in some default links
 	$default_links = array();
-	$default_links[] = array(	'link_url' => 'http://codex.wordpress.org/',
+	$default_links[] = array(	'link_url' => __( 'http://codex.wordpress.org/' ),
-								'link_name' => 'Documentation',
+								'link_name' => __( 'Documentation' ),
 								'link_rss' => '',
 								'link_notes' => '');
-	$default_links[] = array(	'link_url' => 'http://wordpress.org/development/',
+	$default_links[] = array(	'link_url' => __( 'http://wordpress.org/news/' ),
-								'link_name' => 'Development Blog',
+								'link_name' => __( 'WordPress Blog' ),
-								'link_rss' => 'http://wordpress.org/development/feed/',
+								'link_rss' => __( 'http://wordpress.org/news/feed/' ),
 								'link_notes' => '');
-	$default_links[] = array(	'link_url' => 'http://wordpress.org/extend/ideas/',
+	$default_links[] = array(	'link_url' => __( 'http://wordpress.org/support/' ),
-								'link_name' => 'Suggest Ideas',
+								'link_name' => _x( 'Support Forums', 'default link' ),
 								'link_rss' => '',
 								'link_notes' =>'');
-	$default_links[] = array(	'link_url' => 'http://wordpress.org/support/',
+	$default_links[] = array(	'link_url' => 'http://wordpress.org/extend/plugins/',
-								'link_name' => 'Support Forum',
+								'link_name' => _x( 'Plugins', 'Default link to wordpress.org/extend/plugins/' ),
 								'link_rss' => '',
 								'link_notes' =>'');
-	$default_links[] = array(	'link_url' => 'http://wordpress.org/extend/plugins/',
+	$default_links[] = array(	'link_url' => 'http://wordpress.org/extend/themes/',
-								'link_name' => 'Plugins',
+								'link_name' => _x( 'Themes', 'Default link to wordpress.org/extend/themes/' ),
 								'link_rss' => '',
 								'link_notes' =>'');
-	$default_links[] = array(	'link_url' => 'http://wordpress.org/extend/themes/',
+	$default_links[] = array(	'link_url' => __( 'http://wordpress.org/support/forum/requests-and-feedback' ),
-								'link_name' => 'Themes',
+								'link_name' => __( 'Feedback' ),
 								'link_rss' => '',
 								'link_notes' =>'');
-	$default_links[] = array(	'link_url' => 'http://planet.wordpress.org/',
+	$default_links[] = array(	'link_url' => __( 'http://planet.wordpress.org/' ),
-								'link_name' => 'WordPress Planet',
+								'link_name' => __( 'WordPress Planet' ),
 								'link_rss' => '',
 								'link_notes' =>'');
 	foreach ( $default_links as $link ) {
 		$wpdb->insert( $wpdb->links, $link);
-		$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 2, 'object_id' => $wpdb->insert_id) );
+		$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $blogroll_tt_id, 'object_id' => $wpdb->insert_id) );
 	}
 	// First post
 	$now = date('Y-m-d H:i:s');
 	$now_gmt = gmdate('Y-m-d H:i:s');
 	$first_post_guid = get_option('home') . '/?p=1';
+	if ( is_multisite() ) {
+		$first_post = get_site_option( 'first_post' );
+		if ( empty($first_post) )
+			$first_post = stripslashes( __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ) );
+		$first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post );
+		$first_post = str_replace( "SITE_NAME", $current_site->site_name, $first_post );
+	} else {
+		$first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!');
+	}
 	$wpdb->insert( $wpdb->posts, array(
 								'post_author' => $user_id,
 								'post_date' => $now,
 								'post_date_gmt' => $now_gmt,
-								'post_content' => __('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'),
+								'post_content' => $first_post,
 								'post_excerpt' => '',
 								'post_title' => __('Hello world!'),
 								/* translators: Default post slug */
-								'post_name' => _x('hello-world', 'Default post slug'),
+								'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
 								'post_modified' => $now,
 								'post_modified_gmt' => $now_gmt,
 								'guid' => $first_post_guid,
 								'comment_count' => 1,
 								'to_ping' => '',
 								'pinged' => '',
 								'post_content_filtered' => ''
 								));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => 1, 'object_id' => 1) );
+	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
 	// Default comment
+	$first_comment_author = __('Mr WordPress');
+	$first_comment_url = 'http://wordpress.org/';
+	$first_comment = __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
+	if ( is_multisite() ) {
+		$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
+		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
+		$first_comment = get_site_option( 'first_comment', $first_comment );
+	}
 	$wpdb->insert( $wpdb->comments, array(
 								'comment_post_ID' => 1,
-								'comment_author' => __('Mr WordPress'),
+								'comment_author' => $first_comment_author,
 								'comment_author_email' => '',
-								'comment_author_url' => 'http://wordpress.org/',
+								'comment_author_url' => $first_comment_url,
 								'comment_date' => $now,
 								'comment_date_gmt' => $now_gmt,
-								'comment_content' => __('Hi, this is a comment.<br />To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.')
+								'comment_content' => $first_comment
 								));
 	// First Page
+	$first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+<blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my blog. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
+...or something like this:
+<blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickies to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
+	if ( is_multisite() )
+		$first_page = get_site_option( 'first_page', $first_page );
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 								'post_author' => $user_id,
 								'post_date' => $now,
 								'post_date_gmt' => $now_gmt,
-								'post_content' => __('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'),
+								'post_content' => $first_page,
 								'post_excerpt' => '',
-								'post_title' => __('About'),
+								'post_title' => __( 'Sample Page' ),
 								/* translators: Default page slug */
-								'post_name' => _x('about', 'Default page slug'),
+								'post_name' => __( 'sample-page' ),
 								'post_modified' => $now,
 								'post_modified_gmt' => $now_gmt,
 								'guid' => $first_post_guid,
 								'post_type' => 'page',
 								'to_ping' => '',
 								'pinged' => '',
 								'post_content_filtered' => ''
 								));
+	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+	// Set up default widgets for default theme.
+	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
+	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
+	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
+	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
+	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
+	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
+	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array ( ), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'sidebar-2' => array ( ), 'sidebar-3' => array ( ), 'sidebar-4' => array ( ), 'sidebar-5' => array ( ), 'array_version' => 3 ) );
+	if ( ! is_multisite() )
+		update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
+		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( is_multisite() ) {
+		// Flush rules to pick up the new page.
+		$wp_rewrite->init();
+		$wp_rewrite->flush_rules();
+		$user = new WP_User($user_id);
+		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+		// Remove all perms except for the login user.
+		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
+		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
+		if ( !is_super_admin( $user_id ) && $user_id != 1 )
+			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+	}
 }
 endif;
 if ( !function_exists('wp_new_blog_notification') ) :
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.1.0
 *
 * @param string $blog_title Blog title.
 * @param string $blog_url Blog url.
 * @param int $user_id User ID.
 * @param string $password User's Password.
 */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
 	$user = new WP_User($user_id);
 	$email = $user->user_email;
 	$name = $user->user_login;
-	$message = sprintf(__("Your new WordPress blog has been successfully set up at:
+	$message = sprintf(__("Your new WordPress site has been successfully set up at:
 %1\$s
 You can log in to the administrator account with the following information:
 Username: %2\$s
 Password: %3\$s
-We hope you enjoy your new blog. Thanks!
+We hope you enjoy your new site. Thanks!
 --The WordPress Team
 http://wordpress.org/
 "), $blog_url, $name, $password);
-	@wp_mail($email, __('New WordPress Blog'), $message);
+	@wp_mail($email, __('New WordPress Site'), $message);
 }
 endif;
 if ( !function_exists('wp_upgrade') ) :
 /**
 * Run WordPress Upgrade functions.
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.1.0
 *
 * @return null
 */
 function wp_upgrade() {
-	global $wp_current_db_version, $wp_db_version;
+	global $wp_current_db_version, $wp_db_version, $wpdb;
 	$wp_current_db_version = __get_option('db_version');
-	// We are up-to-date.  Nothing to do.
+	// We are up-to-date. Nothing to do.
 	if ( $wp_db_version == $wp_current_db_version )
 		return;
-	if( ! is_blog_installed() )
+	if ( ! is_blog_installed() )
 		return;
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
+	if ( is_multisite() && is_main_site() )
+		upgrade_network();
 	wp_cache_flush();
+	if ( is_multisite() ) {
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
+			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		else
+			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+	}
 }
 endif;
 /**
 * Functions to be called in install and upgrade scripts.
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.0.1
 */
 function upgrade_all() {
-	global $wp_current_db_version, $wp_db_version, $wp_rewrite;
+	global $wp_current_db_version, $wp_db_version;
 	$wp_current_db_version = __get_option('db_version');
-	// We are up-to-date.  Nothing to do.
+	// We are up-to-date. Nothing to do.
 	if ( $wp_db_version == $wp_current_db_version )
 		return;
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
 		upgrade_230_old_tables();
 	if ( $wp_current_db_version < 7499 )
 		upgrade_250();
-	if ( $wp_current_db_version < 7796 )
-		upgrade_251();
 	if ( $wp_current_db_version < 7935 )
 		upgrade_252();
 	if ( $wp_current_db_version < 8201 )
 		upgrade_260();
 	if ( $wp_current_db_version < 10360 )
 		upgrade_280();
 	if ( $wp_current_db_version < 11958 )
 		upgrade_290();
+	if ( $wp_current_db_version < 15260 )
+		upgrade_300();
+	if ( $wp_current_db_version < 19389 )
+		upgrade_330();
+	if ( $wp_current_db_version < 20080 )
+		upgrade_340();
 	maybe_disable_automattic_widgets();
 	update_option( 'db_version', $wp_db_version );
 	update_option( 'db_upgraded', true );
 	// Get the GMT offset, we'll use that later on
 	$all_options = get_alloptions_110();
 	$time_difference = $all_options->time_difference;
-	$server_time = time()+date('Z');
+		$server_time = time()+date('Z');
 	$weblogger_time = $server_time + $time_difference*3600;
 	$gmt_time = time();
 	$diff_gmt_server = ($gmt_time - $server_time) / 3600;
 	$diff_weblogger_server = ($weblogger_time - $server_time) / 3600;
 	add_option('gmt_offset', $gmt_offset);
 	// Check if we already set the GMT fields (if we did, then
 	// MAX(post_date_gmt) can't be '0000-00-00 00:00:00'
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
-	$got_gmt_fields = ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00') ? false : true;
+	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 	if (!$got_gmt_fields) {
-		// Add or substract time to all dates, to get GMT dates
+		// Add or subtract time to all dates, to get GMT dates
 		$add_hours = intval($diff_gmt_weblogger);
 		$add_minutes = intval(60 * ($diff_gmt_weblogger - $add_hours));
 		$wpdb->query("UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
 		$wpdb->query("UPDATE $wpdb->posts SET post_modified = post_date");
 		$wpdb->query("UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'");
 	}
 	$active_plugins = __get_option('active_plugins');
 	// If plugins are not stored in an array, they're stored in the old
-	// newline separated format.  Convert to new format.
+	// newline separated format. Convert to new format.
 	if ( !is_array( $active_plugins ) ) {
 		$active_plugins = explode("\n", trim($active_plugins));
 		update_option('active_plugins', $active_plugins);
 	}
 	populate_roles_160();
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
 		if ( !empty( $user->user_firstname ) )
-			update_usermeta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) );
+			update_user_meta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) );
 		if ( !empty( $user->user_lastname ) )
-			update_usermeta( $user->ID, 'last_name', $wpdb->escape($user->user_lastname) );
+			update_user_meta( $user->ID, 'last_name', $wpdb->escape($user->user_lastname) );
 		if ( !empty( $user->user_nickname ) )
-			update_usermeta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
+			update_user_meta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
 		if ( !empty( $user->user_level ) )
-			update_usermeta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
 		if ( !empty( $user->user_icq ) )
-			update_usermeta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
+			update_user_meta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
 		if ( !empty( $user->user_aim ) )
-			update_usermeta( $user->ID, 'aim', $wpdb->escape($user->user_aim) );
+			update_user_meta( $user->ID, 'aim', $wpdb->escape($user->user_aim) );
 		if ( !empty( $user->user_msn ) )
-			update_usermeta( $user->ID, 'msn', $wpdb->escape($user->user_msn) );
+			update_user_meta( $user->ID, 'msn', $wpdb->escape($user->user_msn) );
 		if ( !empty( $user->user_yim ) )
-			update_usermeta( $user->ID, 'yim', $wpdb->escape($user->user_icq) );
+			update_user_meta( $user->ID, 'yim', $wpdb->escape($user->user_icq) );
 		if ( !empty( $user->user_description ) )
-			update_usermeta( $user->ID, 'description', $wpdb->escape($user->user_description) );
+			update_user_meta( $user->ID, 'description', $wpdb->escape($user->user_description) );
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
 			if ($idmode == 'nickname') $id = $user->user_nickname;
 			if ($idmode == 'login') $id = $user->user_login;
 			if (!$idmode) $id = $user->user_nickname;
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_usermeta( $user->ID, $wpdb->prefix . 'capabilities');
+		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
 		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_usermeta($user->ID, $wpdb->prefix . 'user_level');
+			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
 			$role = translate_level_to_role($level);
-			update_usermeta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
 		}
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
 		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
 	$wpdb->show_errors();
 	// populate comment_count field of posts table
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if( is_array( $comments ) )
+	if ( is_array( $comments ) )
 		foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
 	// Some alpha versions used a post status of object instead of attachment and put
 	// the mime type in post_type instead of post_mime_type.
 			continue;
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
-	// < 3570 we used linkcategories.  >= 3570 we used categories and link2cat.
+	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
 	if ( $wp_current_db_version < 3570 ) {
-		// Create link_category terms for link categories.  Create a map of link cat IDs
+		// Create link_category terms for link categories. Create a map of link cat IDs
 		// to link_category terms.
 		$link_cat_id_map = array();
 		$default_link_cat = 0;
 		$tt_ids = array();
 		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
 	}
 }
 /**
-* Execute changes made in WordPress 2.5.1.
-*
-* @since 2.5.1
-*/
-function upgrade_251() {
-	global $wp_current_db_version;
-	// Make the secret longer
-	update_option('secret', wp_generate_password(64));
-}
-/**
 * Execute changes made in WordPress 2.5.2.
 *
 * @since 2.5.2
 */
 function upgrade_252() {
 * Execute changes made in WordPress 2.8.
 *
 * @since 2.8.0
 */
 function upgrade_280() {
-	global $wp_current_db_version;
+	global $wp_current_db_version, $wpdb;
 	if ( $wp_current_db_version < 10360 )
 		populate_roles_280();
+	if ( is_multisite() ) {
+		$start = 0;
+		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
+			foreach( $rows as $row ) {
+				$value = $row->option_value;
+				if ( !@unserialize( $value ) )
+					$value = stripslashes( $value );
+				if ( $value !== $row->option_value ) {
+					update_option( $row->option_name, $value );
+				}
+			}
+			$start += 20;
+		}
+		refresh_blog_details( $wpdb->blogid );
+	}
 }
 /**
 * Execute changes made in WordPress 2.9.
 *
 			update_option( 'thread_comments', 0 );
 		}
 	}
 }
+/**
+* Execute changes made in WordPress 3.0.
+*
+* @since 3.0.0
+*/
+function upgrade_300() {
+	global $wp_current_db_version, $wpdb;
+	if ( $wp_current_db_version < 15093 )
+		populate_roles_300();
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
+		add_site_option( 'siteurl', '' );
+	// 3.0 screen options key name changes.
+	if ( is_main_site() && !defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
+		$prefix = like_escape($wpdb->base_prefix);
+		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key LIKE '{$prefix}%meta-box-hidden%' OR meta_key LIKE '{$prefix}%closedpostboxes%' OR meta_key LIKE '{$prefix}%manage-%-columns-hidden%' OR meta_key LIKE '{$prefix}%meta-box-order%' OR meta_key LIKE '{$prefix}%metaboxorder%' OR meta_key LIKE '{$prefix}%screen_layout%'
+					 OR meta_key = 'manageedittagscolumnshidden' OR meta_key='managecategoriescolumnshidden' OR meta_key = 'manageedit-tagscolumnshidden' OR meta_key = 'manageeditcolumnshidden' OR meta_key = 'categories_per_page' OR meta_key = 'edit_tags_per_page'" );
+	}
+}
+/**
+* Execute changes made in WordPress 3.3.
+*
+* @since 3.3.0
+*/
+function upgrade_330() {
+	global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
+	if ( $wp_current_db_version < 19061 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
+	}
+	if ( $wp_current_db_version >= 11548 )
+		return;
+	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$_sidebars_widgets = array();
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+		$sidebars_widgets['array_version'] = 3;
+	elseif ( !isset($sidebars_widgets['array_version']) )
+		$sidebars_widgets['array_version'] = 1;
+	switch ( $sidebars_widgets['array_version'] ) {
+		case 1 :
+			foreach ( (array) $sidebars_widgets as $index => $sidebar )
+			if ( is_array($sidebar) )
+			foreach ( (array) $sidebar as $i => $name ) {
+				$id = strtolower($name);
+				if ( isset($wp_registered_widgets[$id]) ) {
+					$_sidebars_widgets[$index][$i] = $id;
+					continue;
+				}
+				$id = sanitize_title($name);
+				if ( isset($wp_registered_widgets[$id]) ) {
+					$_sidebars_widgets[$index][$i] = $id;
+					continue;
+				}
+				$found = false;
+				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+					if ( strtolower($widget['name']) == strtolower($name) ) {
+						$_sidebars_widgets[$index][$i] = $widget['id'];
+						$found = true;
+						break;
+					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+						$_sidebars_widgets[$index][$i] = $widget['id'];
+						$found = true;
+						break;
+					}
+				}
+				if ( $found )
+					continue;
+				unset($_sidebars_widgets[$index][$i]);
+			}
+			$_sidebars_widgets['array_version'] = 2;
+			$sidebars_widgets = $_sidebars_widgets;
+			unset($_sidebars_widgets);
+		case 2 :
+			$sidebars_widgets = retrieve_widgets();
+			$sidebars_widgets['array_version'] = 3;
+			update_option( 'sidebars_widgets', $sidebars_widgets );
+	}
+}
+/**
+* Execute changes made in WordPress 3.4.
+*
+* @since 3.4.0
+*/
+function upgrade_340() {
+	global $wp_current_db_version, $wpdb;
+	if ( $wp_current_db_version < 19798 ) {
+		$wpdb->hide_errors();
+		$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+		$wpdb->show_errors();
+	}
+	if ( $wp_current_db_version < 19799 ) {
+		$wpdb->hide_errors();
+		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
+		$wpdb->show_errors();
+	}
+	if ( $wp_current_db_version < 20022 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
+	}
+	if ( $wp_current_db_version < 20080 ) {
+		if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
+			$uninstall_plugins = get_option( 'uninstall_plugins' );
+			delete_option( 'uninstall_plugins' );
+			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+		}
+	}
+}
+/**
+* Execute network level changes
+*
+* @since 3.0.0
+*/
+function upgrade_network() {
+	global $wp_current_db_version, $wpdb;
+	// 2.8
+	if ( $wp_current_db_version < 11549 ) {
+		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
+		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
+		if ( $wpmu_sitewide_plugins ) {
+			if ( !$active_sitewide_plugins )
+				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			else
+				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+		}
+		delete_site_option( 'wpmu_sitewide_plugins' );
+		delete_site_option( 'deactivated_sitewide_plugins' );
+		$start = 0;
+		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
+			foreach( $rows as $row ) {
+				$value = $row->meta_value;
+				if ( !@unserialize( $value ) )
+					$value = stripslashes( $value );
+				if ( $value !== $row->meta_value ) {
+					update_site_option( $row->meta_key, $value );
+				}
+			}
+			$start += 20;
+		}
+	}
+	// 3.0
+	if ( $wp_current_db_version < 13576 )
+		update_site_option( 'global_terms_enabled', '1' );
+	// 3.3
+	if ( $wp_current_db_version < 19390 )
+		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19470 ) {
+		if ( false === get_site_option( 'active_sitewide_plugins' ) )
+			update_site_option( 'active_sitewide_plugins', array() );
+	}
+	// 3.4
+	if ( $wp_current_db_version < 20148 ) {
+		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
+		$allowedthemes  = get_site_option( 'allowedthemes'  );
+		$allowed_themes = get_site_option( 'allowed_themes' );
+		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
+			$converted = array();
+			$themes = wp_get_themes();
+			foreach ( $themes as $stylesheet => $theme_data ) {
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
+					$converted[ $stylesheet ] = true;
+			}
+			update_site_option( 'allowedthemes', $converted );
+			delete_site_option( 'allowed_themes' );
+		}
+	}
+}
 // The functions we use to actually do stuff
 // General
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.0.0
 *
 * @param string $table_name Database table name to create.
 * @param string $create_ddl SQL statement to create table.
 * @return bool If table already exists or was created by function.
 */
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.0.1
 *
 * @param string $table Database table name.
 * @param string $index Index name to drop.
 * @return bool True, when finished.
 */
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.0.1
 *
 * @param string $table Database table name.
 * @param string $index Database table index column.
 * @return bool True, when done with execution.
 */
 ** Add column to db table if it doesn't exist.
 ** Returns:  true if already exists or on successful completion
 **           false on error
 */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-	global $wpdb, $debug;
+	global $wpdb;
 	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-		if ($debug) echo("checking $column == $column_name<br />");
 		if ($column == $column_name) {
 			return true;
 		}
 	}
 	//didn't find it try to create it.
 *
 * @return array List of options.
 */
 function get_alloptions_110() {
 	global $wpdb;
-	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+	$all_options = new stdClass;
-		foreach ($options as $option) {
+	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
-			// "When trying to design a foolproof system,
+		foreach ( $options as $option ) {
-			//  never underestimate the ingenuity of the fools :)" -- Dougal
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-			if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+				$option->option_value = untrailingslashit( $option->option_value );
-			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+			$all_options->{$option->option_name} = stripslashes( $option->option_value );
-			if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
-			$all_options->{$option->option_name} = stripslashes($option->option_value);
 		}
 	}
 	return $all_options;
 }
 /**
 * Version of get_option that is private to install/upgrade.
 *
-* @since unknown
+* @since 1.5.1
 * @access private
 *
 * @param string $setting Option name.
 * @return mixed
 */
 function __get_option($setting) {
 	global $wpdb;
-	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return preg_replace( '|/+$|', '', constant( 'WP_HOME' ) );
+		return untrailingslashit( WP_HOME );
-	}
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+		return untrailingslashit( WP_SITEURL );
-		return preg_replace( '|/+$|', '', constant( 'WP_SITEURL' ) );
-	}
+	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting) );
 	if ( 'home' == $setting && '' == $option )
-		return __get_option('siteurl');
+		return __get_option( 'siteurl' );
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = preg_replace('|/+$|', '', $option);
+		$option = untrailingslashit( $option );
-	@ $kellogs = unserialize($option);
+	@ $kellogs = unserialize( $option );
-	if ($kellogs !== FALSE)
+	if ( $kellogs !== false )
 		return $kellogs;
 	else
 		return $option;
 }
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 *
 * @param string $content
 * @return string
 */
 function deslash($content) {
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 *
 * @param unknown_type $queries
 * @param unknown_type $execute
 * @return unknown
 */
-function dbDelta($queries, $execute = true) {
+function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
+	    $queries = wp_get_db_schema( $queries );
 	// Separate individual queries into an array
-	if( !is_array($queries) ) {
+	if ( !is_array($queries) ) {
 		$queries = explode( ';', $queries );
-		if('' == $queries[count($queries) - 1]) array_pop($queries);
+		$queries = array_filter( $queries );
 	}
+	$queries = apply_filters( 'dbdelta_queries', $queries );
 	$cqueries = array(); // Creation Queries
 	$iqueries = array(); // Insertion Queries
 	$for_update = array();
 	// Create a tablename index for an array ($cqueries) of queries
 	foreach($queries as $qry) {
-		if(preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+		if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
-			$cqueries[trim( strtolower($matches[1]), '`' )] = $qry;
+			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
 			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		}
+		} else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
-		else if(preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
 			array_unshift($cqueries, $qry);
-		}
+		} else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
-		else if(preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		}
+		} else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
-		else if(preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		}
+		} else {
-		else {
 			// Unrecognized query type
 		}
 	}
+	$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
-	// Check to see which tables and fields exist
+	$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
-	if($tables = $wpdb->get_col('SHOW TABLES;')) {
-		// For every table in the database
+	$global_tables = $wpdb->tables( 'global' );
-		foreach($tables as $table) {
+	foreach ( $cqueries as $table => $qry ) {
-			// If a table query exists for the database table...
+		// Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
-			if( array_key_exists(strtolower($table), $cqueries) ) {
+		if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
-				// Clear the field and index arrays
+			continue;
-				unset($cfields);
-				unset($indices);
+		// Fetch the table column structure from the database
-				// Get all of the field names in the query from between the parens
+		$wpdb->suppress_errors();
-				preg_match("|\((.*)\)|ms", $cqueries[strtolower($table)], $match2);
+		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
-				$qryline = trim($match2[1]);
+		$wpdb->suppress_errors( false );
-				// Separate field lines into an array
+		if ( ! $tablefields )
-				$flds = explode("\n", $qryline);
+			continue;
-				//echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
+		// Clear the field and index arrays
+		$cfields = $indices = array();
-				// For every field line specified in the query
+		// Get all of the field names in the query from between the parens
-				foreach($flds as $fld) {
+		preg_match("|\((.*)\)|ms", $qry, $match2);
-					// Extract the field name
+		$qryline = trim($match2[1]);
-					preg_match("|^([^ ]*)|", trim($fld), $fvals);
-					$fieldname = trim( $fvals[1], '`' );
+		// Separate field lines into an array
+		$flds = explode("\n", $qryline);
-					// Verify the found field name
-					$validfield = true;
+		//echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
-					switch(strtolower($fieldname))
-					{
+		// For every field line specified in the query
-					case '':
+		foreach ($flds as $fld) {
-					case 'primary':
+			// Extract the field name
-					case 'index':
+			preg_match("|^([^ ]*)|", trim($fld), $fvals);
-					case 'fulltext':
+			$fieldname = trim( $fvals[1], '`' );
-					case 'unique':
-					case 'key':
+			// Verify the found field name
-						$validfield = false;
+			$validfield = true;
-						$indices[] = trim(trim($fld), ", \n");
+			switch (strtolower($fieldname)) {
-						break;
+			case '':
-					}
+			case 'primary':
-					$fld = trim($fld);
+			case 'index':
+			case 'fulltext':
-					// If it's a valid field, add it to the field array
+			case 'unique':
-					if($validfield) {
+			case 'key':
-						$cfields[strtolower($fieldname)] = trim($fld, ", \n");
+				$validfield = false;
+				$indices[] = trim(trim($fld), ", \n");
+				break;
+			}
+			$fld = trim($fld);
+			// If it's a valid field, add it to the field array
+			if ($validfield) {
+				$cfields[strtolower($fieldname)] = trim($fld, ", \n");
+			}
+		}
+		// For every field in the table
+		foreach ($tablefields as $tablefield) {
+			// If the table field exists in the field array...
+			if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
+				// Get the field type from the query
+				preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
+				$fieldtype = $matches[1];
+				// Is actual field type different from the field type in query?
+				if ($tablefield->Type != $fieldtype) {
+					// Add a query to change the column type
+					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+					$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+				}
+				// Get the default value from the array
+					//echo "{$cfields[strtolower($tablefield->Field)]}<br>";
+				if (preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
+					$default_value = $matches[1];
+					if ($tablefield->Default != $default_value) {
+						// Add a query to change the column's default value
+						$cqueries[] = "ALTER TABLE {$table} ALTER COLUMN {$tablefield->Field} SET DEFAULT '{$default_value}'";
+						$for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
 					}
 				}
-				// Fetch the table column structure from the database
+				// Remove the field from the array (so it's not added)
-				$tablefields = $wpdb->get_results("DESCRIBE {$table};");
+				unset($cfields[strtolower($tablefield->Field)]);
+			} else {
-				// For every field in the table
+				// This field exists in the table, but not in the creation queries?
-				foreach($tablefields as $tablefield) {
+			}
-					// If the table field exists in the field array...
+		}
-					if(array_key_exists(strtolower($tablefield->Field), $cfields)) {
-						// Get the field type from the query
+		// For every remaining field specified for the table
-						preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
+		foreach ($cfields as $fieldname => $fielddef) {
-						$fieldtype = $matches[1];
+			// Push a query line into $cqueries that adds the field to that table
+			$cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
-						// Is actual field type different from the field type in query?
+			$for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
-						if($tablefield->Type != $fieldtype) {
+		}
-							// Add a query to change the column type
-							$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+		// Index stuff goes here
-							$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+		// Fetch the table index structure from the database
-						}
+		$tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
-						// Get the default value from the array
+		if ($tableindices) {
-							//echo "{$cfields[strtolower($tablefield->Field)]}<br>";
+			// Clear the index array
-						if(preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
+			unset($index_ary);
-							$default_value = $matches[1];
-							if($tablefield->Default != $default_value)
+			// For every index in the table
-							{
+			foreach ($tableindices as $tableindex) {
-								// Add a query to change the column's default value
+				// Add the index to the index data array
-								$cqueries[] = "ALTER TABLE {$table} ALTER COLUMN {$tablefield->Field} SET DEFAULT '{$default_value}'";
+				$keyname = $tableindex->Key_name;
-								$for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
+				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-							}
+				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
-						}
+			}
-						// Remove the field from the array (so it's not added)
+			// For each actual index in the index array
-						unset($cfields[strtolower($tablefield->Field)]);
+			foreach ($index_ary as $index_name => $index_data) {
-					}
+				// Build a create string to compare to the query
-					else {
+				$index_string = '';
-						// This field exists in the table, but not in the creation queries?
+				if ($index_name == 'PRIMARY') {
+					$index_string .= 'PRIMARY ';
+				} else if($index_data['unique']) {
+					$index_string .= 'UNIQUE ';
+				}
+				$index_string .= 'KEY ';
+				if ($index_name != 'PRIMARY') {
+					$index_string .= $index_name;
+				}
+				$index_columns = '';
+				// For each column in the index
+				foreach ($index_data['columns'] as $column_data) {
+					if ($index_columns != '') $index_columns .= ',';
+					// Add the field to the column list string
+					$index_columns .= $column_data['fieldname'];
+					if ($column_data['subpart'] != '') {
+						$index_columns .= '('.$column_data['subpart'].')';
 					}
 				}
+				// Add the column list to the index create string
-				// For every remaining field specified for the table
+				$index_string .= ' ('.$index_columns.')';
-				foreach($cfields as $fieldname => $fielddef) {
+				if (!(($aindex = array_search($index_string, $indices)) === false)) {
-					// Push a query line into $cqueries that adds the field to that table
+					unset($indices[$aindex]);
-					$cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
+					//echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
-					$for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
 				}
+				//else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
-				// Index stuff goes here
-				// Fetch the table index structure from the database
-				$tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
-				if($tableindices) {
-					// Clear the index array
-					unset($index_ary);
-					// For every index in the table
-					foreach($tableindices as $tableindex) {
-						// Add the index to the index data array
-						$keyname = $tableindex->Key_name;
-						$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-						$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
-					}
-					// For each actual index in the index array
-					foreach($index_ary as $index_name => $index_data) {
-						// Build a create string to compare to the query
-						$index_string = '';
-						if($index_name == 'PRIMARY') {
-							$index_string .= 'PRIMARY ';
-						}
-						else if($index_data['unique']) {
-							$index_string .= 'UNIQUE ';
-						}
-						$index_string .= 'KEY ';
-						if($index_name != 'PRIMARY') {
-							$index_string .= $index_name;
-						}
-						$index_columns = '';
-						// For each column in the index
-						foreach($index_data['columns'] as $column_data) {
-							if($index_columns != '') $index_columns .= ',';
-							// Add the field to the column list string
-							$index_columns .= $column_data['fieldname'];
-							if($column_data['subpart'] != '') {
-								$index_columns .= '('.$column_data['subpart'].')';
-							}
-						}
-						// Add the column list to the index create string
-						$index_string .= ' ('.$index_columns.')';
-						if(!(($aindex = array_search($index_string, $indices)) === false)) {
-							unset($indices[$aindex]);
-							//echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
-						}
-						//else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
-					}
-				}
-				// For every remaining index specified for the table
-				foreach ( (array) $indices as $index ) {
-					// Push a query line into $cqueries that adds the index to that table
-					$cqueries[] = "ALTER TABLE {$table} ADD $index";
-					$for_update[$table.'.'.$fieldname] = 'Added index '.$table.' '.$index;
-				}
-				// Remove the original table creation query from processing
-				unset($cqueries[strtolower($table)]);
-				unset($for_update[strtolower($table)]);
-			} else {
-				// This table exists in the database, but not in the creation queries?
 			}
 		}
+		// For every remaining index specified for the table
+		foreach ( (array) $indices as $index ) {
+			// Push a query line into $cqueries that adds the index to that table
+			$cqueries[] = "ALTER TABLE {$table} ADD $index";
+			$for_update[$table.'.'.$fieldname] = 'Added index '.$table.' '.$index;
+		}
+		// Remove the original table creation query from processing
+		unset( $cqueries[ $table ], $for_update[ $table ] );
 	}
 	$allqueries = array_merge($cqueries, $iqueries);
-	if($execute) {
+	if ($execute) {
-		foreach($allqueries as $query) {
+		foreach ($allqueries as $query) {
 			//echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">".print_r($query, true)."</pre>\n";
 			$wpdb->query($query);
 		}
 	}
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 */
-function make_db_current() {
+function make_db_current( $tables = 'all' ) {
-	global $wp_queries;
+	$alterations = dbDelta( $tables );
-	$alterations = dbDelta($wp_queries);
 	echo "<ol>\n";
 	foreach($alterations as $alteration) echo "<li>$alteration</li>\n";
 	echo "</ol>\n";
 }
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 */
-function make_db_current_silent() {
+function make_db_current_silent( $tables = 'all' ) {
-	global $wp_queries;
+	$alterations = dbDelta( $tables );
-	$alterations = dbDelta($wp_queries);
 }
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 *
 * @param unknown_type $theme_name
 * @param unknown_type $template
 * @return unknown
 */
 	if (! file_exists("$home_path/index.php"))
 		return false;
 	// Copy files from the old locations to the site theme.
-	// TODO: This does not copy arbitarary include dependencies.  Only the
+	// TODO: This does not copy arbitrary include dependencies. Only the
 	// standard WP files are copied.
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 	foreach ($files as $oldfile => $newfile) {
 		if ($oldfile == 'index.php')
 			$oldpath = ABSPATH;
 		if ($oldfile == 'index.php') { // Check to make sure it's not a new index
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/default/index.php', "$site_dir/$newfile"))
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
 					return false;
 				continue; // Don't copy anything
 				}
 		}
 			fclose($f);
 		}
 	}
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 	$stylelines = file_get_contents("$site_dir/style.css");
 	if ($stylelines) {
 		$f = fopen("$site_dir/style.css", 'w');
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 *
 * @param unknown_type $theme_name
 * @param unknown_type $template
 * @return unknown
 */
 function make_site_theme_from_default($theme_name, $template) {
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
-	$default_dir = WP_CONTENT_DIR . '/themes/default';
+	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
-	$theme_dir = @ opendir("$default_dir");
+	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
 			if (is_dir("$default_dir/$theme_file"))
 				continue;
 			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 1.5.0
 *
 * @return unknown
 */
 function make_site_theme() {
 	// Name the theme after the blog.
 		return false;
 	}
 	if (file_exists(ABSPATH . 'wp-layout.css')) {
 		if (! make_site_theme_from_oldschool($theme_name, $template)) {
-			// TODO:  rm -rf the site theme directory.
+			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
 		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO:  rm -rf the site theme directory.
+			// TODO: rm -rf the site theme directory.
 			return false;
 	}
 	// Make the new site theme active.
 	$current_template = __get_option('template');
-	if ($current_template == 'default') {
+	if ($current_template == WP_DEFAULT_THEME) {
 		update_option('template', $template);
 		update_option('stylesheet', $template);
 	}
 	return $template;
 }
 /**
 * Translate user level to user role name.
 *
-* @since unknown
+* @since 2.0.0
 *
 * @param int $level User level.
 * @return string User role name.
 */
 function translate_level_to_role($level) {
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.1.0
 */
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
 	if ( is_wp_error( $result ) )
 /**
 * {@internal Missing Short Description}}
 *
 * {@internal Missing Long Description}}
 *
-* @since unknown
+* @since 2.2.0
 */
 function maybe_disable_automattic_widgets() {
 	$plugins = __get_option( 'active_plugins' );
 	foreach ( (array) $plugins as $plugin ) {
 	}
 }
 /**
 * Runs before the schema is upgraded.
+*
+* @since 2.9.0
 */
 function pre_schema_upgrade() {
 	global $wp_current_db_version, $wp_db_version, $wpdb;
 	// Upgrade versions prior to 2.9
 	if ( $wp_current_db_version < 11557 ) {
-		// Delete duplicate options.  Keep the option with the highest option_id.
+		// Delete duplicate options. Keep the option with the highest option_id.
 		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
 		// Drop the old primary key and add the new.
 		$wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");
 		$wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
 	}
 }
-?>
+/**
+* Install global terms.
+*
+* @since 3.0.0
+*
+*/
+if ( !function_exists( 'install_global_terms' ) ) :
+function install_global_terms() {
+	global $wpdb, $charset_collate;
+	$ms_queries = "
+CREATE TABLE $wpdb->sitecategories (
+cat_ID bigint(20) NOT NULL auto_increment,
+cat_name varchar(55) NOT NULL default '',
+category_nicename varchar(200) NOT NULL default '',
+last_updated timestamp NOT NULL,
+PRIMARY KEY  (cat_ID),
+KEY category_nicename (category_nicename),
+KEY last_updated (last_updated)
+) $charset_collate;
+";
+// now create tables
+	dbDelta( $ms_queries );
+}
+endif;

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b