* @global string
* @name $charset_collate
*/
-$charset_collate = '';
-
-if ( ! empty( $wpdb->charset ) )
- $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-if ( ! empty( $wpdb->collate ) )
- $charset_collate .= " COLLATE $wpdb->collate";
+$charset_collate = $wpdb->get_charset_collate();
/**
* Retrieve the SQL for creating database tables.
* @since 3.3.0
*
* @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.
+ * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
* @return string The SQL needed to create the requested tables.
*/
function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
comment_parent bigint(20) unsigned NOT NULL default '0',
user_id bigint(20) unsigned NOT NULL default '0',
PRIMARY KEY (comment_ID),
- KEY comment_approved (comment_approved),
KEY comment_post_ID (comment_post_ID),
KEY comment_approved_date_gmt (comment_approved,comment_date_gmt),
KEY comment_date_gmt (comment_date_gmt),
) $charset_collate;
CREATE TABLE $wpdb->options (
option_id bigint(20) unsigned NOT NULL auto_increment,
- blog_id int(11) NOT NULL default '0',
option_name varchar(64) NOT NULL default '',
option_value longtext NOT NULL,
autoload varchar(20) NOT NULL default 'yes',
pinged text NOT NULL,
post_modified datetime NOT NULL default '0000-00-00 00:00:00',
post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
- post_content_filtered text NOT NULL,
+ post_content_filtered longtext NOT NULL,
post_parent bigint(20) unsigned NOT NULL default '0',
guid varchar(255) NOT NULL default '',
menu_order int(11) NOT NULL default '0',
$template = WP_DEFAULT_THEME;
// If default theme is a child theme, we need to get its template
- foreach ( (array) get_themes() as $theme ) {
- if ( WP_DEFAULT_THEME == $theme['Stylesheet'] ) {
- $template = $theme['Template'];
- break;
- }
- }
+ $theme = wp_get_theme( $template );
+ if ( ! $theme->errors() )
+ $template = $theme->get_template();
+
+ $timezone_string = '';
+ $gmt_offset = 0;
+ /* translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
+ or a valid timezone string (America/New_York). See http://us3.php.net/manual/en/timezones.php
+ for all timezone strings supported by PHP.
+ */
+ $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
+ if ( is_numeric( $offset_or_tz ) )
+ $gmt_offset = $offset_or_tz;
+ elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
+ $timezone_string = $offset_or_tz;
$options = array(
'siteurl' => $guessurl,
'blogdescription' => __('Just another WordPress site'),
'users_can_register' => 0,
'admin_email' => 'you@example.com',
- 'start_of_week' => 1,
+ /* translators: default start of the week. 0 = Sunday, 1 = Monday */
+ 'start_of_week' => _x( '1', 'start of week' ),
'use_balanceTags' => 0,
'use_smilies' => 1,
'require_name_email' => 1,
'default_comment_status' => 'open',
'default_ping_status' => 'open',
'default_pingback_flag' => 1,
- 'default_post_edit_rows' => 20,
'posts_per_page' => 10,
/* translators: default date format, see http://php.net/date */
'date_format' => __('F j, Y'),
'ping_sites' => 'http://rpc.pingomatic.com/',
'advanced_edit' => 0,
'comment_max_links' => 2,
- 'gmt_offset' => date('Z') / 3600,
+ 'gmt_offset' => $gmt_offset,
// 1.5
'default_email_category' => 1,
'comment_whitelist' => 1,
'blacklist_keys' => '',
'comment_registration' => 0,
- 'rss_language' => 'en',
'html_type' => 'text/html',
// 1.5.1
// 2.6
'avatar_default' => 'mystery',
- 'enable_app' => 0,
- 'enable_xmlrpc' => 0,
// 2.7
'large_size_w' => 1024,
'widget_categories' => array(),
'widget_text' => array(),
'widget_rss' => array(),
+ 'uninstall_plugins' => array(),
// 2.8
- 'timezone_string' => '',
-
- // 2.9
- 'embed_autourls' => 1,
- 'embed_size_w' => '',
- 'embed_size_h' => 600,
+ 'timezone_string' => $timezone_string,
// 3.0
'page_for_posts' => 0,
// 3.1
'default_post_format' => 0,
+
+ // 3.5
+ 'link_manager_enabled' => 0,
);
// 3.3
}
// Set autoload to no for these options
- $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
+ $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
- $existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");
+ $keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
+ $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
$insert = '';
foreach ( $options as $option => $value ) {
else
$autoload = 'yes';
- $option = $wpdb->escape($option);
if ( is_array($value) )
$value = serialize($value);
- $value = $wpdb->escape($value);
if ( !empty($insert) )
$insert .= ', ';
- $insert .= "('$option', '$value', '$autoload')";
+ $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
}
if ( !empty($insert) )
if ( !__get_option('home') ) update_option('home', $guessurl);
// Delete unused options
- $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins', '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');
+ $unusedoptions = array(
+ 'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory',
+ 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping',
+ 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers',
+ 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference',
+ 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char',
+ 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1',
+ 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5',
+ 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9',
+ 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat',
+ 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce',
+ '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins',
+ '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',
+ );
foreach ( $unusedoptions as $option )
delete_option($option);
add_role('subscriber', 'Subscriber');
// Add caps for Administrator role
- $role =& get_role('administrator');
+ $role = get_role('administrator');
$role->add_cap('switch_themes');
$role->add_cap('edit_themes');
$role->add_cap('activate_plugins');
$role->add_cap('level_0');
// Add caps for Editor role
- $role =& get_role('editor');
+ $role = get_role('editor');
$role->add_cap('moderate_comments');
$role->add_cap('manage_categories');
$role->add_cap('manage_links');
$role->add_cap('level_0');
// Add caps for Author role
- $role =& get_role('author');
+ $role = get_role('author');
$role->add_cap('upload_files');
$role->add_cap('edit_posts');
$role->add_cap('edit_published_posts');
$role->add_cap('level_0');
// Add caps for Contributor role
- $role =& get_role('contributor');
+ $role = get_role('contributor');
$role->add_cap('edit_posts');
$role->add_cap('read');
$role->add_cap('level_1');
$role->add_cap('level_0');
// Add caps for Subscriber role
- $role =& get_role('subscriber');
+ $role = get_role('subscriber');
$role->add_cap('read');
$role->add_cap('level_0');
}
function populate_roles_210() {
$roles = array('administrator', 'editor');
foreach ($roles as $role) {
- $role =& get_role($role);
+ $role = get_role($role);
if ( empty($role) )
continue;
$role->add_cap('read_private_pages');
}
- $role =& get_role('administrator');
+ $role = get_role('administrator');
if ( ! empty($role) ) {
$role->add_cap('delete_users');
$role->add_cap('create_users');
}
- $role =& get_role('author');
+ $role = get_role('author');
if ( ! empty($role) ) {
$role->add_cap('delete_posts');
$role->add_cap('delete_published_posts');
}
- $role =& get_role('contributor');
+ $role = get_role('contributor');
if ( ! empty($role) ) {
$role->add_cap('delete_posts');
}
* @since 2.3.0
*/
function populate_roles_230() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$role->add_cap( 'unfiltered_upload' );
* @since 2.5.0
*/
function populate_roles_250() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$role->add_cap( 'edit_dashboard' );
* @since 2.6.0
*/
function populate_roles_260() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$role->add_cap( 'update_plugins' );
* @since 2.7.0
*/
function populate_roles_270() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$role->add_cap( 'install_plugins' );
* @since 2.8.0
*/
function populate_roles_280() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$role->add_cap( 'install_themes' );
* @since 3.0.0
*/
function populate_roles_300() {
- $role =& get_role( 'administrator' );
+ $role = get_role( 'administrator' );
if ( !empty( $role ) ) {
$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' );
'admin_user_id' => $site_user->ID,
'registration' => 'none',
'upload_filetypes' => 'jpg jpeg png gif mp3 mov avi wmv midi mid pdf',
- 'blog_upload_space' => 10,
+ 'blog_upload_space' => 100,
'fileupload_maxk' => 1500,
'site_admins' => $site_admins,
'allowedthemes' => $allowed_themes,
// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
'siteurl' => get_option( 'siteurl' ) . '/',
'add_new_users' => '0',
- 'upload_space_check_disabled' => '0',
+ 'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
'subdomain_install' => intval( $subdomain_install ),
'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
+ 'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
'initial_db_version' => get_option( 'initial_db_version' ),
'active_sitewide_plugins' => array(),
+ 'WPLANG' => get_locale(),
);
if ( ! $subdomain_install )
$sitemeta['illegal_names'][] = 'blog';
$insert = '';
foreach ( $sitemeta as $meta_key => $meta_value ) {
- $meta_key = $wpdb->escape( $meta_key );
if ( is_array( $meta_value ) )
$meta_value = serialize( $meta_value );
- $meta_value = $wpdb->escape( $meta_value );
if ( !empty( $insert ) )
$insert .= ', ';
- $insert .= "( $network_id, '$meta_key', '$meta_value')";
+ $insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
}
$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
- $current_site->domain = $domain;
- $current_site->path = $path;
- $current_site->site_name = ucfirst( $domain );
-
- if ( !is_multisite() ) {
+ // When upgrading from single to multisite, assume the current site will become the main site of the network.
+ // When using populate_network() to create another network in an existing multisite environment,
+ // skip these steps since the main site of the new network has not yet been created.
+ if ( ! is_multisite() ) {
+ $current_site = new stdClass;
+ $current_site->domain = $domain;
+ $current_site->path = $path;
+ $current_site->site_name = ucfirst( $domain );
$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
- $blog_id = $wpdb->insert_id;
+ $current_site->blog_id = $blog_id = $wpdb->insert_id;
update_user_meta( $site_user->ID, 'source_domain', $domain );
update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
- if ( !$upload_path = get_option( 'upload_path' ) ) {
- $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads';
- update_option( 'upload_path', $upload_path );
- }
- update_option( 'fileupload_url', get_option( 'siteurl' ) . '/' . $upload_path );
- }
- if ( $subdomain_install )
- update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
- else
- update_option( 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/');
+ if ( $subdomain_install )
+ $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+ else
+ $wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
- $wp_rewrite->flush_rules();
+ flush_rewrite_rules();
+ }
if ( $subdomain_install ) {
$vhost_ok = false;
return true;
}
-
-?>