*
* @since 3.3.0
*
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
*
* @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
* @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
$max_index_length = 191;
// Blog specific tables.
- $blog_tables = "CREATE TABLE $wpdb->terms (
+ $blog_tables = "CREATE TABLE $wpdb->termmeta (
+ meta_id bigint(20) unsigned NOT NULL auto_increment,
+ term_id bigint(20) unsigned NOT NULL default '0',
+ meta_key varchar(255) default NULL,
+ meta_value longtext,
+ PRIMARY KEY (meta_id),
+ KEY term_id (term_id),
+ KEY meta_key (meta_key($max_index_length))
+) $charset_collate;
+CREATE TABLE $wpdb->terms (
term_id bigint(20) unsigned NOT NULL auto_increment,
name varchar(200) NOT NULL default '',
slug varchar(200) NOT NULL default '',
) $charset_collate;
CREATE TABLE $wpdb->options (
option_id bigint(20) unsigned NOT NULL auto_increment,
- option_name varchar(64) NOT NULL default '',
+ option_name varchar(191) NOT NULL default '',
option_value longtext NOT NULL,
autoload varchar(20) NOT NULL default 'yes',
PRIMARY KEY (option_id),
$users_single_table = "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_pass varchar(255) 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_activation_key varchar(255) NOT NULL default '',
user_status int(11) NOT NULL default '0',
display_name varchar(250) NOT NULL default '',
PRIMARY KEY (ID),
$users_multi_table = "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_pass varchar(255) 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_activation_key varchar(255) 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',
$uploads_use_yearmonth_folders = 1;
}
- $template = WP_DEFAULT_THEME;
- // If default theme is a child theme, we need to get its template
- $theme = wp_get_theme( $template );
- if ( ! $theme->errors() )
- $template = $theme->get_template();
+ // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
+ $stylesheet = $template = WP_DEFAULT_THEME;
+ $theme = wp_get_theme( WP_DEFAULT_THEME );
+ if ( ! $theme->exists() ) {
+ $theme = WP_Theme::get_core_default_theme();
+ }
+
+ // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
+ if ( $theme ) {
+ $stylesheet = $theme->get_stylesheet();
+ $template = $theme->get_template();
+ }
$timezone_string = '';
$gmt_offset = 0;
'comment_moderation' => 0,
'moderation_notify' => 1,
'permalink_structure' => '',
- 'gzipcompression' => 0,
'hack_file' => 0,
'blog_charset' => 'UTF-8',
'moderation_keys' => '',
'active_plugins' => array(),
'category_base' => '',
'ping_sites' => 'http://rpc.pingomatic.com/',
- 'advanced_edit' => 0,
'comment_max_links' => 2,
'gmt_offset' => $gmt_offset,
'default_email_category' => 1,
'recently_edited' => '',
'template' => $template,
- 'stylesheet' => WP_DEFAULT_THEME,
+ 'stylesheet' => $stylesheet,
'comment_whitelist' => 1,
'blacklist_keys' => '',
'comment_registration' => 0,
// 2.7
'large_size_w' => 1024,
'large_size_h' => 1024,
- 'image_default_link_type' => 'file',
+ 'image_default_link_type' => 'none',
'image_default_size' => '',
'image_default_align' => '',
'close_comments_for_old_posts' => 0,
// 4.3.0
'finished_splitting_shared_terms' => 1,
+ 'site_icon' => 0,
+
+ // 4.4.0
+ 'medium_large_size_w' => 768,
+ 'medium_large_size_h' => 0,
);
// 3.3
'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron',
'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page',
'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
- 'embed_autourls', 'default_post_edit_rows',
+ 'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
);
foreach ( $unusedoptions as $option )
delete_option($option);
$role->add_cap( 'update_core' );
$role->add_cap( 'list_users' );
$role->add_cap( 'remove_users' );
-
- /*
- * Never used, will be removed. create_users or promote_users
- * is the capability you're looking for.
- */
- $role->add_cap( 'add_users' );
-
$role->add_cap( 'promote_users' );
$role->add_cap( 'edit_theme_options' );
$role->add_cap( 'delete_themes' );
if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
- $site_user = get_user_by( 'email', $email );
if ( ! is_email( $email ) )
- $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
+ $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
if ( $errors->get_error_code() )
return $errors;
+ // If a user with the provided email does not exist, default to the current user as the new network admin.
+ $site_user = get_user_by( 'email', $email );
+ if ( false === $site_user ) {
+ $site_user = wp_get_current_user();
+ }
+
// Set up site tables.
$template = get_option( 'template' );
$stylesheet = get_option( 'stylesheet' );
$allowed_themes = array( $stylesheet => true );
- if ( $template != $stylesheet )
+
+ if ( $template != $stylesheet ) {
$allowed_themes[ $template ] = true;
- if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
+ }
+
+ if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
$allowed_themes[ WP_DEFAULT_THEME ] = true;
+ }
+
+ // If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
+ if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
+ if ( $core_default = WP_Theme::get_core_default_theme() ) {
+ $allowed_themes[ $core_default->get_stylesheet() ] = true;
+ }
+ }
if ( 1 == $network_id ) {
$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
$sitemeta = array(
'site_name' => $site_name,
- 'admin_email' => $site_user->user_email,
+ 'admin_email' => $email,
'admin_user_id' => $site_user->ID,
'registration' => 'none',
'upload_filetypes' => implode( ' ', $upload_filetypes ),
'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
'wpmu_upgrade_site' => $wp_db_version,
'welcome_email' => $welcome_email,
- 'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
+ /* translators: %s: site link */
+ 'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
'siteurl' => get_option( 'siteurl' ) . '/',
'add_new_users' => '0',
if ( ! $vhost_ok ) {
$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
- $msg .= '<p>' . sprintf( __( 'The installer attempted to contact a random hostname (<code>%1$s</code>) on your domain.' ), $hostname );
- if ( ! empty ( $errstr ) )
+
+ $msg .= '<p>' . sprintf(
+ /* translators: %s: host name */
+ __( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
+ '<code>' . $hostname . '</code>'
+ );
+ if ( ! empty ( $errstr ) ) {
+ /* translators: %s: error message */
$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+ }
$msg .= '</p>';
- $msg .= '<p>' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a <code>*</code> hostname record pointing at your web server in your DNS configuration tool.' ) . '</p>';
+
+ $msg .= '<p>' . sprintf(
+ /* translators: %s: asterisk symbol (*) */
+ __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
+ '<code>*</code>'
+ ) . '</p>';
+
$msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
+
return new WP_Error( 'no_wildcard_dns', $msg );
}
}