X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..refs/tags/wordpress-3.1:/wp-admin/includes/upgrade.php
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index a4d5abae..f29f594e 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -24,18 +24,22 @@ if ( !function_exists('wp_install') ) :
*
* {@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();
@@ -57,14 +61,20 @@ function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='
// Create default user. If the user already exists, the user tables are
// being shared among blogs. Just set the role in that case.
$user_id = username_exists($user_name);
- if ( !$user_id ) {
- $random_password = wp_generate_password();
+ $user_password = trim($user_password);
+ $email_password = false;
+ if ( !$user_id && empty($user_password) ) {
+ $user_password = wp_generate_password( 12, false );
$message = __('Note that password carefully! It is a random password that was generated just for you.');
- $user_id = wp_create_user($user_name, $random_password, $user_email);
- update_usermeta($user_id, 'default_password_nag', true);
+ $user_id = wp_create_user($user_name, $user_password, $user_email);
+ update_user_option($user_id, 'default_password_nag', true, true);
+ $email_password = true;
+ } else if ( !$user_id ) {
+ // Password has been provided
+ $message = ''.__('Your chosen password.').'';
+ $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);
@@ -74,11 +84,11 @@ function wp_install($blog_title, $user_name, $user_email, $public, $deprecated='
$wp_rewrite->flush_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;
@@ -88,28 +98,52 @@ if ( !function_exists('wp_install_defaults') ) :
*
* {@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) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '1', 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+ if ( global_terms_enabled() ) {
+ $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) );
- $wpdb->insert( $wpdb->term_taxonomy, array('term_id' => '2', 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 7));
+ if ( global_terms_enabled() ) {
+ $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();
@@ -118,9 +152,9 @@ function wp_install_defaults($user_id) {
'link_rss' => '',
'link_notes' => '');
- $default_links[] = array( 'link_url' => 'http://wordpress.org/development/',
- 'link_name' => 'Development Blog',
- 'link_rss' => 'http://wordpress.org/development/feed/',
+ $default_links[] = array( 'link_url' => 'http://wordpress.org/news/',
+ 'link_name' => 'WordPress Blog',
+ 'link_rss' => 'http://wordpress.org/news/feed/',
'link_notes' => '');
$default_links[] = array( 'link_url' => 'http://wordpress.org/extend/ideas/',
@@ -150,7 +184,7 @@ function wp_install_defaults($user_id) {
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
@@ -158,15 +192,27 @@ function wp_install_defaults($user_id) {
$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 SITE_NAME. 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,
@@ -175,29 +221,49 @@ function wp_install_defaults($user_id) {
'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.
To delete a comment, just log in and view the post'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.
To delete a comment, just log in and view the post'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:
+
+
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ña coladas. (And gettin' caught in the rain.)+ +...or something like this: + +
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.+ +As a new WordPress user, you should go to your dashboard 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, @@ -206,6 +272,33 @@ function wp_install_defaults($user_id) { '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 ( ), 'primary-widget-area' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'secondary-widget-area' => array ( ), 'first-footer-widget-area' => array ( ), 'second-footer-widget-area' => array ( ), 'third-footer-widget-area' => array ( ), 'fourth-footer-widget-area' => array ( ), 'array_version' => 3 ) ); + + 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->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $wpdb->base_prefix.'1_capabilities') ); + } } endif; @@ -215,7 +308,7 @@ if ( !function_exists('wp_new_blog_notification') ) : * * {@internal Missing Long Description}} * - * @since unknown + * @since 2.1.0 * * @param string $blog_title Blog title. * @param string $blog_url Blog url. @@ -226,7 +319,7 @@ 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 @@ -235,13 +328,13 @@ 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; @@ -251,12 +344,12 @@ if ( !function_exists('wp_upgrade') ) : * * {@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'); @@ -264,14 +357,24 @@ function wp_upgrade() { 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; @@ -280,7 +383,7 @@ endif; * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.0.1 */ function upgrade_all() { global $wp_current_db_version, $wp_db_version, $wp_rewrite; @@ -330,9 +433,6 @@ function upgrade_all() { if ( $wp_current_db_version < 7499 ) upgrade_250(); - if ( $wp_current_db_version < 7796 ) - upgrade_251(); - if ( $wp_current_db_version < 7935 ) upgrade_252(); @@ -345,6 +445,12 @@ function upgrade_all() { if ( $wp_current_db_version < 10360 ) upgrade_280(); + if ( $wp_current_db_version < 11958 ) + upgrade_290(); + + if ( $wp_current_db_version < 15260 ) + upgrade_300(); + maybe_disable_automattic_widgets(); update_option( 'db_version', $wp_db_version ); @@ -466,7 +572,7 @@ function upgrade_110() { // 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' //
\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."
{$table}:\n"; } @@ -1360,8 +1560,8 @@ function dbDelta($queries, $execute = true) { } $allqueries = array_merge($cqueries, $iqueries); - if($execute) { - foreach($allqueries as $query) { + if ($execute) { + foreach ($allqueries as $query) { //echo "
Found index:".$index_string."
".print_r($query, true)."\n"; $wpdb->query($query); } @@ -1375,7 +1575,7 @@ function dbDelta($queries, $execute = true) { * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.5.0 */ function make_db_current() { global $wp_queries; @@ -1391,7 +1591,7 @@ function make_db_current() { * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.5.0 */ function make_db_current_silent() { global $wp_queries; @@ -1404,7 +1604,7 @@ function make_db_current_silent() { * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.5.0 * * @param unknown_type $theme_name * @param unknown_type $template @@ -1431,7 +1631,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { 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 } @@ -1464,7 +1664,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { } // 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) { @@ -1483,7 +1683,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.5.0 * * @param unknown_type $theme_name * @param unknown_type $template @@ -1491,12 +1691,12 @@ function make_site_theme_from_oldschool($theme_name, $template) { */ 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")) @@ -1549,7 +1749,7 @@ function make_site_theme_from_default($theme_name, $template) { * * {@internal Missing Long Description}} * - * @since unknown + * @since 1.5.0 * * @return unknown */ @@ -1587,7 +1787,7 @@ function make_site_theme() { // 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); } @@ -1597,7 +1797,7 @@ function make_site_theme() { /** * Translate user level to user role name. * - * @since unknown + * @since 2.0.0 * * @param int $level User level. * @return string User role name. @@ -1628,7 +1828,7 @@ function translate_level_to_role($level) { * * {@internal Missing Long Description}} * - * @since unknown + * @since 2.1.0 */ function wp_check_mysql_version() { global $wpdb; @@ -1642,7 +1842,7 @@ function wp_check_mysql_version() { * * {@internal Missing Long Description}} * - * @since unknown + * @since 2.2.0 */ function maybe_disable_automattic_widgets() { $plugins = __get_option( 'active_plugins' ); @@ -1656,4 +1856,146 @@ function maybe_disable_automattic_widgets() { } } +/** + * 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. + $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)"); + + // Drop the old option_name index. dbDelta() doesn't do the drop. + $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name"); + } + +} + +/** + * Install Network. + * + * @since 3.0.0 + * + */ +if ( !function_exists( 'install_network' ) ) : +function install_network() { + global $wpdb, $charset_collate; + $ms_queries = " +CREATE TABLE $wpdb->users ( + ID bigint(20) unsigned NOT NULL auto_increment, + user_login varchar(60) NOT NULL default '', + user_pass varchar(64) NOT NULL default '', + user_nicename varchar(50) NOT NULL default '', + user_email varchar(100) NOT NULL default '', + user_url varchar(100) NOT NULL default '', + user_registered datetime NOT NULL default '0000-00-00 00:00:00', + user_activation_key varchar(60) NOT NULL default '', + user_status int(11) NOT NULL default '0', + display_name varchar(250) NOT NULL default '', + spam tinyint(2) NOT NULL default '0', + deleted tinyint(2) NOT NULL default '0', + PRIMARY KEY (ID), + KEY user_login_key (user_login), + KEY user_nicename (user_nicename) +) $charset_collate; +CREATE TABLE $wpdb->blogs ( + blog_id bigint(20) NOT NULL auto_increment, + site_id bigint(20) NOT NULL default '0', + domain varchar(200) NOT NULL default '', + path varchar(100) NOT NULL default '', + registered datetime NOT NULL default '0000-00-00 00:00:00', + last_updated datetime NOT NULL default '0000-00-00 00:00:00', + public tinyint(2) NOT NULL default '1', + archived enum('0','1') NOT NULL default '0', + mature tinyint(2) NOT NULL default '0', + spam tinyint(2) NOT NULL default '0', + deleted tinyint(2) NOT NULL default '0', + lang_id int(11) NOT NULL default '0', + PRIMARY KEY (blog_id), + KEY domain (domain(50),path(5)), + KEY lang_id (lang_id) +) $charset_collate; +CREATE TABLE $wpdb->blog_versions ( + blog_id bigint(20) NOT NULL default '0', + db_version varchar(20) NOT NULL default '', + last_updated datetime NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (blog_id), + KEY db_version (db_version) +) $charset_collate; +CREATE TABLE $wpdb->registration_log ( + ID bigint(20) NOT NULL auto_increment, + email varchar(255) NOT NULL default '', + IP varchar(30) NOT NULL default '', + blog_id bigint(20) NOT NULL default '0', + date_registered datetime NOT NULL default '0000-00-00 00:00:00', + PRIMARY KEY (ID), + KEY IP (IP) +) $charset_collate; +CREATE TABLE $wpdb->site ( + id bigint(20) NOT NULL auto_increment, + domain varchar(200) NOT NULL default '', + path varchar(100) NOT NULL default '', + PRIMARY KEY (id), + KEY domain (domain,path) +) $charset_collate; +CREATE TABLE $wpdb->sitemeta ( + meta_id bigint(20) NOT NULL auto_increment, + site_id bigint(20) NOT NULL default '0', + meta_key varchar(255) default NULL, + meta_value longtext, + PRIMARY KEY (meta_id), + KEY meta_key (meta_key), + KEY site_id (site_id) +) $charset_collate; +CREATE TABLE $wpdb->signups ( + domain varchar(200) NOT NULL default '', + path varchar(100) NOT NULL default '', + title longtext NOT NULL, + user_login varchar(60) NOT NULL default '', + user_email varchar(100) NOT NULL default '', + registered datetime NOT NULL default '0000-00-00 00:00:00', + activated datetime NOT NULL default '0000-00-00 00:00:00', + active tinyint(1) NOT NULL default '0', + activation_key varchar(50) NOT NULL default '', + meta longtext, + KEY activation_key (activation_key), + KEY domain (domain) +) $charset_collate; +"; +// now create tables + dbDelta( $ms_queries ); +} +endif; + +/** + * 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; ?>