diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-admin/includes/schema.php
--- a/wp/wp-admin/includes/schema.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/schema.php Mon Oct 14 17:39:30 2019 +0200
@@ -8,14 +8,17 @@
* @subpackage Administration
*/
-// Declare these as global in case schema.php is included from a function.
+/**
+ * Declare these as global in case schema.php is included from a function.
+ *
+ * @global wpdb $wpdb
+ * @global array $wp_queries
+ * @global string $charset_collate
+ */
global $wpdb, $wp_queries, $charset_collate;
/**
* The database character collate.
- * @var string
- * @global string
- * @name $charset_collate
*/
$charset_collate = $wpdb->get_charset_collate();
@@ -24,19 +27,16 @@
*
* @since 3.3.0
*
+ * @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.
+ * @param int $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site ID.
* @return string The SQL needed to create the requested tables.
*/
function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
global $wpdb;
- $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();
if ( $blog_id && $blog_id != $wpdb->blogid )
$old_blog_id = $wpdb->set_blog_id( $blog_id );
@@ -52,7 +52,16 @@
$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 '',
@@ -130,7 +139,7 @@
) $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),
@@ -156,7 +165,7 @@
post_status varchar(20) NOT NULL default 'publish',
comment_status varchar(20) NOT NULL default 'open',
ping_status varchar(20) NOT NULL default 'open',
- post_password varchar(20) NOT NULL default '',
+ post_password varchar(255) NOT NULL default '',
post_name varchar(200) NOT NULL default '',
to_ping text NOT NULL,
pinged text NOT NULL,
@@ -180,36 +189,38 @@
$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),
KEY user_login_key (user_login),
- KEY user_nicename (user_nicename)
+ KEY user_nicename (user_nicename),
+ KEY user_email (user_email)
) $charset_collate;\n";
// Multisite users table
$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',
deleted tinyint(2) NOT NULL default '0',
PRIMARY KEY (ID),
KEY user_login_key (user_login),
- KEY user_nicename (user_nicename)
+ KEY user_nicename (user_nicename),
+ KEY user_email (user_email)
) $charset_collate;\n";
// Usermeta.
@@ -333,7 +344,8 @@
* @since 1.5.0
*
* @global wpdb $wpdb WordPress database abstraction object.
- * @uses $wp_db_version
+ * @global int $wp_db_version
+ * @global int $wp_current_db_version
*/
function populate_options() {
global $wpdb, $wp_db_version, $wp_current_db_version;
@@ -353,16 +365,23 @@
$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;
/* 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
+ or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php
for all timezone strings supported by PHP.
*/
$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
@@ -375,7 +394,7 @@
'siteurl' => $guessurl,
'home' => $guessurl,
'blogname' => __('My Site'),
- /* translators: blog tagline */
+ /* translators: site tagline */
'blogdescription' => __('Just another WordPress site'),
'users_can_register' => 0,
'admin_email' => 'you@example.com',
@@ -396,23 +415,22 @@
'default_ping_status' => 'open',
'default_pingback_flag' => 1,
'posts_per_page' => 10,
- /* translators: default date format, see http://php.net/date */
+ /* translators: default date format, see https://secure.php.net/date */
'date_format' => __('F j, Y'),
- /* translators: default time format, see http://php.net/date */
+ /* translators: default time format, see https://secure.php.net/date */
'time_format' => __('g:i a'),
- /* translators: links last updated date format, see http://php.net/date */
+ /* translators: links last updated date format, see https://secure.php.net/date */
'links_updated_date_format' => __('F j, Y g:i a'),
'comment_moderation' => 0,
'moderation_notify' => 1,
'permalink_structure' => '',
- 'gzipcompression' => 0,
+ 'rewrite_rules' => '',
'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,
@@ -420,7 +438,7 @@
'default_email_category' => 1,
'recently_edited' => '',
'template' => $template,
- 'stylesheet' => WP_DEFAULT_THEME,
+ 'stylesheet' => $stylesheet,
'comment_whitelist' => 1,
'blacklist_keys' => '',
'comment_registration' => 0,
@@ -461,7 +479,7 @@
// 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,
@@ -490,6 +508,20 @@
// 3.5
'link_manager_enabled' => 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,
+
+ // 4.9.6
+ 'wp_page_for_privacy_policy' => 0,
+
+ // 4.9.8
+ 'show_comments_cookies_opt_in' => 0,
);
// 3.3
@@ -500,8 +532,8 @@
// 3.0 multisite
if ( is_multisite() ) {
- /* translators: blog tagline */
- $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
+ /* translators: site tagline */
+ $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_network()->site_name );
$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
}
@@ -550,7 +582,7 @@
'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);
@@ -558,27 +590,8 @@
// 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, and the corresponding
- * transient_timeout record from table b.
- */
- $time = time();
- $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
- WHERE a.option_name LIKE %s
- AND a.option_name NOT LIKE %s
- AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
- 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() ) {
- $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
- WHERE a.option_name LIKE %s
- AND a.option_name NOT LIKE %s
- AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
- AND b.option_value < %d";
- $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
- }
+ // Clear expired transients
+ delete_expired_transients( true );
}
/**
@@ -828,13 +841,6 @@
$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' );
@@ -842,13 +848,12 @@
}
}
+if ( !function_exists( 'install_network' ) ) :
/**
* Install Network.
*
* @since 3.0.0
- *
*/
-if ( !function_exists( 'install_network' ) ) :
function install_network() {
if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
define( 'WP_INSTALLING_NETWORK', true );
@@ -862,8 +867,19 @@
*
* @since 3.0.0
*
- * @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,
+ * @global wpdb $wpdb
+ * @global object $current_site
+ * @global int $wp_db_version
+ * @global WP_Rewrite $wp_rewrite
+ *
+ * @param int $network_id ID of network to populate.
+ * @param string $domain The domain name for the network (eg. "example.com").
+ * @param string $email Email address for the network administrator.
+ * @param string $site_name The name of the network.
+ * @param string $path Optional. The path to append to the network's domain name. Default '/'.
+ * @param bool $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation.
+ * Default false, meaning the network is a subdirectory installation.
+ * @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
* so the error code must be checked) or failure.
*/
function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
@@ -876,24 +892,48 @@
$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
// 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.' ) );
+ $network_exists = false;
+ if ( is_multisite() ) {
+ if ( get_network( (int) $network_id ) ) {
+ $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+ }
+ } else {
+ 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 ) );
@@ -906,17 +946,22 @@
if ( !is_multisite() ) {
$site_admins = array( $site_user->user_login );
- $users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
+ $users = get_users( array(
+ 'fields' => array( 'user_login' ),
+ 'role' => 'administrator',
+ ) );
if ( $users ) {
foreach ( $users as $user ) {
- if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
- $site_admins[] = $user->user_login;
+ $site_admins[] = $user->user_login;
}
+
+ $site_admins = array_unique( $site_admins );
}
} else {
$site_admins = get_site_option( 'site_admins' );
}
+ /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
$welcome_email = __( 'Howdy USERNAME,
Your new SITE_NAME site has been successfully set up at:
@@ -948,7 +993,7 @@
$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 ),
@@ -959,7 +1004,8 @@
'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 SITE_NAME. 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',
@@ -975,7 +1021,7 @@
$sitemeta['illegal_names'][] = 'blog';
/**
- * Filter meta for a network on creation.
+ * Filters meta for a network on creation.
*
* @since 3.7.0
*
@@ -1032,12 +1078,26 @@
if ( ! $vhost_ok ) {
$msg = '' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '
';
- $msg .= '' . sprintf( __( 'The installer attempted to contact a random hostname (%1$s) on your domain.' ), $hostname );
- if ( ! empty ( $errstr ) )
+
+ $msg .= '
' . sprintf(
+ /* translators: %s: host name */
+ __( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
+ '' . $hostname . ''
+ );
+ if ( ! empty ( $errstr ) ) {
+ /* translators: %s: error message */
$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '' . $errstr . '' );
+ }
$msg .= '
';
- $msg .= '' . __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool.' ) . '
';
+
+ $msg .= '' . 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.' ),
+ '*'
+ ) . '
';
+
$msg .= '' . __( '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.' ) . '
';
+
return new WP_Error( 'no_wildcard_dns', $msg );
}
}