enmi-conf.org: comparison wp/wp-admin/includes/schema.php

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
 	if ( $blog_id && $blog_id != $wpdb->blogid )
 		$old_blog_id = $wpdb->set_blog_id( $blog_id );
 	// Engage multisite if in the middle of turning it on from network.php.
 	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
+	/*
+	 * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
+	 * As of 4.2, however, we moved to utf8mb4, which uses 4 bytes per character. This means that an index which
+	 * used to have room for floor(767/3) = 255 characters, now only has room for floor(767/4) = 191 characters.
+	 */
+	$max_index_length = 191;
 	// Blog specific tables.
 	$blog_tables = "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 '',
 term_group bigint(10) NOT NULL default 0,
 PRIMARY KEY  (term_id),
-UNIQUE KEY slug (slug),
+KEY slug (slug($max_index_length)),
-KEY name (name)
+KEY name (name($max_index_length))
 ) $charset_collate;
 CREATE TABLE $wpdb->term_taxonomy (
 term_taxonomy_id bigint(20) unsigned NOT NULL auto_increment,
 term_id bigint(20) unsigned NOT NULL default 0,
 taxonomy varchar(32) NOT NULL default '',
 comment_id bigint(20) unsigned NOT NULL default '0',
 meta_key varchar(255) default NULL,
 meta_value longtext,
 PRIMARY KEY  (meta_id),
 KEY comment_id (comment_id),
-KEY meta_key (meta_key)
+KEY meta_key (meta_key($max_index_length))
 ) $charset_collate;
 CREATE TABLE $wpdb->comments (
 comment_ID bigint(20) unsigned NOT NULL auto_increment,
 comment_post_ID bigint(20) unsigned NOT NULL default '0',
 comment_author tinytext NOT NULL,
 user_id bigint(20) unsigned NOT NULL default '0',
 PRIMARY KEY  (comment_ID),
 KEY comment_post_ID (comment_post_ID),
 KEY comment_approved_date_gmt (comment_approved,comment_date_gmt),
 KEY comment_date_gmt (comment_date_gmt),
-KEY comment_parent (comment_parent)
+KEY comment_parent (comment_parent),
+KEY comment_author_email (comment_author_email(10))
 ) $charset_collate;
 CREATE TABLE $wpdb->links (
 link_id bigint(20) unsigned NOT NULL auto_increment,
 link_url varchar(255) NOT NULL default '',
 link_name varchar(255) NOT NULL default '',
 post_id bigint(20) unsigned NOT NULL default '0',
 meta_key varchar(255) default NULL,
 meta_value longtext,
 PRIMARY KEY  (meta_id),
 KEY post_id (post_id),
-KEY meta_key (meta_key)
+KEY meta_key (meta_key($max_index_length))
 ) $charset_collate;
 CREATE TABLE $wpdb->posts (
 ID bigint(20) unsigned NOT NULL auto_increment,
 post_author bigint(20) unsigned NOT NULL default '0',
 post_date datetime NOT NULL default '0000-00-00 00:00:00',
 menu_order int(11) NOT NULL default '0',
 post_type varchar(20) NOT NULL default 'post',
 post_mime_type varchar(100) NOT NULL default '',
 comment_count bigint(20) NOT NULL default '0',
 PRIMARY KEY  (ID),
-KEY post_name (post_name),
+KEY post_name (post_name($max_index_length)),
 KEY type_status_date (post_type,post_status,post_date,ID),
 KEY post_parent (post_parent),
 KEY post_author (post_author)
 ) $charset_collate;\n";
 PRIMARY KEY  (ID),
 KEY user_login_key (user_login),
 KEY user_nicename (user_nicename)
 ) $charset_collate;\n";
-	// usermeta
+	// Usermeta.
 	$usermeta_table = "CREATE TABLE $wpdb->usermeta (
 umeta_id bigint(20) unsigned NOT NULL auto_increment,
 user_id bigint(20) unsigned NOT NULL default '0',
 meta_key varchar(255) default NULL,
 meta_value longtext,
 PRIMARY KEY  (umeta_id),
 KEY user_id (user_id),
-KEY meta_key (meta_key)
+KEY meta_key (meta_key($max_index_length))
 ) $charset_collate;\n";
 	// Global tables
 	if ( $is_multisite )
 		$global_tables = $users_multi_table . $usermeta_table;
 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)
+KEY domain (domain(140),path(51))
 ) $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 meta_key (meta_key($max_index_length)),
 KEY site_id (site_id)
 ) $charset_collate;
 CREATE TABLE $wpdb->signups (
 signup_id bigint(20) NOT NULL auto_increment,
 domain varchar(200) NOT NULL default '',
 meta longtext,
 PRIMARY KEY  (signup_id),
 KEY activation_key (activation_key),
 KEY user_email (user_email),
 KEY user_login_email (user_login,user_email),
-KEY domain_path (domain,path)
+KEY domain_path (domain(140),path(51))
 ) $charset_collate;";
 	switch ( $scope ) {
 		case 'blog' :
 			$queries = $blog_tables;
 				$queries .= $ms_global_tables;
 			break;
 		case 'ms_global' :
 			$queries = $ms_global_tables;
 			break;
+		case 'all' :
 		default:
-		case 'all' :
 			$queries = $global_tables . $blog_tables;
 			if ( $is_multisite )
 				$queries .= $ms_global_tables;
 			break;
 	}
 /**
 * Create WordPress options and set the default values.
 *
 * @since 1.5.0
-* @uses $wpdb
+*
+* @global wpdb $wpdb WordPress database abstraction object.
 * @uses $wp_db_version
 */
 function populate_options() {
-	global $wpdb, $wp_db_version, $current_site, $wp_current_db_version;
+	global $wpdb, $wp_db_version, $wp_current_db_version;
 	$guessurl = wp_guess_url();
+	/**
-	do_action('populate_options');
+	 * Fires before creating WordPress options and populating their default values.
+	 *
+	 * @since 2.6.0
+	 */
+	do_action( 'populate_options' );
 	if ( ini_get('safe_mode') ) {
 		// Safe mode can break mkdir() so use a flat structure by default.
 		$uploads_use_yearmonth_folders = 0;
 	} else {
 	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
 			$timezone_string = $offset_or_tz;
 	$options = array(
 	'siteurl' => $guessurl,
+	'home' => $guessurl,
 	'blogname' => __('My Site'),
 	/* translators: blog tagline */
 	'blogdescription' => __('Just another WordPress site'),
 	'users_can_register' => 0,
 	'admin_email' => 'you@example.com',
 	'date_format' => __('F j, Y'),
 	/* translators: default time format, see http://php.net/date */
 	'time_format' => __('g:i a'),
 	/* translators: links last updated date format, see http://php.net/date */
 	'links_updated_date_format' => __('F j, Y g:i a'),
-	'links_recently_updated_prepend' => '<em>',
-	'links_recently_updated_append' => '</em>',
-	'links_recently_updated_time' => 120,
 	'comment_moderation' => 0,
 	'moderation_notify' => 1,
 	'permalink_structure' => '',
 	'gzipcompression' => 0,
 	'hack_file' => 0,
 	'blog_charset' => 'UTF-8',
 	'moderation_keys' => '',
 	'active_plugins' => array(),
-	'home' => $guessurl,
 	'category_base' => '',
 	'ping_sites' => 'http://rpc.pingomatic.com/',
 	'advanced_edit' => 0,
 	'comment_max_links' => 2,
 	'gmt_offset' => $gmt_offset,
 	}
 	// 3.0 multisite
 	if ( is_multisite() ) {
 		/* translators: blog tagline */
-		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), $current_site->site_name );
+		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
 		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 	// Set autoload to no for these options
 	$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
 	}
 	if ( !empty($insert) )
 		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
-	// in case it is set, but blank, update "home"
+	// In case it is set, but blank, update "home".
 	if ( !__get_option('home') ) update_option('home', $guessurl);
-	// Delete unused options
+	// 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',
+		'links_recently_updated_time', 'links_recently_updated_prepend', 'links_recently_updated_append',
 		'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',
 		'embed_autourls', 'default_post_edit_rows',
 	);
 	foreach ( $unusedoptions as $option )
 		delete_option($option);
-	// delete obsolete magpie stuff
+	// Delete obsolete magpie stuff.
 	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
-	// Deletes all expired transients.
+	/*
-	// The multi-table delete syntax is used to delete the transient record from table a,
+	 * Deletes all expired transients. The multi-table delete syntax is used
-	// and the corresponding transient_timeout record from table b.
+	 * to delete the transient record from table a, and the corresponding
+	 * transient_timeout record from table b.
+	 */
 	$time = time();
-	$wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE
+	$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-	        a.option_name LIKE '\_transient\_%' AND
+		WHERE a.option_name LIKE %s
-	        a.option_name NOT LIKE '\_transient\_timeout\_%' AND
+		AND a.option_name NOT LIKE %s
-	        b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+		AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
-	        AND b.option_value < $time");
+		AND b.option_value < %d";
+	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
 	if ( is_main_site() && is_main_network() ) {
-		$wpdb->query("DELETE a, b FROM $wpdb->options a, $wpdb->options b WHERE
+		$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
-			a.option_name LIKE '\_site\_transient\_%' AND
+			WHERE a.option_name LIKE %s
-			a.option_name NOT LIKE '\_site\_transient\_timeout\_%' AND
+			AND a.option_name NOT LIKE %s
-			b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
+			AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
-			AND b.option_value < $time");
+			AND b.option_value < %d";
-}
+		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
+	}
 }
 /**
 * Execute WordPress role creation for the various WordPress versions.
 *
 	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.
+		 * 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' );
 	dbDelta( wp_get_db_schema( 'global' ) );
 }
 endif;
 /**
-* populate network settings
+* Populate network settings.
 *
 * @since 3.0.0
 *
-* @param int $network_id id of network to populate
+* @param int $network_id ID of network to populate.
 * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
-* 	so the error code must be checked) or failure.
+*                       so the error code must be checked) or failure.
 */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 	$errors = new WP_Error();
 	if ( '' == $domain )
 		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
 	if ( '' == $site_name )
 		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
-	// check for network collision
+	// Check for network collision.
 	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.' ) );
 	if ( $errors->get_error_code() )
 		return $errors;
-	// set up site tables
+	// Set up site tables.
 	$template = get_option( 'template' );
 	$stylesheet = get_option( 'stylesheet' );
 	$allowed_themes = array( $stylesheet => true );
 	if ( $template != $stylesheet )
 		$allowed_themes[ $template ] = true;
 		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
 		$network_id = $wpdb->insert_id;
 	} else {
 		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
 	}
+	wp_cache_delete( 'networks_have_paths', 'site-options' );
 	if ( !is_multisite() ) {
 		$site_admins = array( $site_user->user_login );
 		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
 		if ( $users ) {
 		}
 	} else {
 		$site_admins = get_site_option( 'site_admins' );
 	}
-	$welcome_email = __( 'Dear User,
+	$welcome_email = __( 'Howdy USERNAME,
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
 You can log in to the administrator account with the following information:
 Username: USERNAME
 Password: PASSWORD
 Log in here: BLOG_URLwp-login.php
 We hope you enjoy your new site. Thanks!
 --The Team @ SITE_NAME' );
+	$misc_exts = array(
+		// Images.
+		'jpg', 'jpeg', 'png', 'gif',
+		// Video.
+		'mov', 'avi', 'mpg', '3gp', '3g2',
+		// "audio".
+		'midi', 'mid',
+		// Miscellaneous.
+		'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key',
+	);
+	$audio_exts = wp_get_audio_extensions();
+	$video_exts = wp_get_video_extensions();
+	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
 	$sitemeta = array(
 		'site_name' => $site_name,
 		'admin_email' => $site_user->user_email,
 		'admin_user_id' => $site_user->ID,
 		'registration' => 'none',
-		'upload_filetypes' => 'jpg jpeg png gif mp3 mov avi wmv midi mid pdf',
+		'upload_filetypes' => implode( ' ', $upload_filetypes ),
 		'blog_upload_space' => 100,
 		'fileupload_maxk' => 1500,
 		'site_admins' => $site_admins,
 		'allowedthemes' => $allowed_themes,
 		'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
 	/**
 	 * Filter meta for a network on creation.
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param array $sitemeta Associative of meta keys and values to be inserted.
+	 * @param array $sitemeta   Associative array of network meta keys and values to be inserted.
-	 * @param int $network_id Network ID being created.
+	 * @param int   $network_id ID of network to populate.
 	 */
 	$sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
 			$insert .= ', ';
 		$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 );
-	// 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,
+	 * When upgrading from single to multisite, assume the current site will
-	// skip these steps since the main site of the new network has not yet been created.
+	 * 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 );

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001