Mirrors/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-20 19:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade/Install: Add support for an optional $options parameter to populate_options().

Browse Source 
Fixes #44893. See #41333.

Built from https://develop.svn.wordpress.org/trunk@43627


git-svn-id: http://core.svn.wordpress.org/trunk@43456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2018-09-05 09:39:24 +00:00
parent 7ee752e40c
commit e2f9dfcebb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/includes/schema.php
View File

@ -356,12 +356,15 @@ $wp_queries = wp_get_db_schema( 'all' );
* Create WordPress options and set the default values.
*
* @since 1.5.0
* @since 5.0.0 The $options parameter has been added.
*
* @global wpdb $wpdb WordPress database abstraction object.
* @global int $wp_db_version
* @global int $wp_current_db_version
*
* @param array $options Optional. Custom option $key => $value pairs to use. Default empty array.
*/
function populate_options() {
function populate_options( array $options = array() ) {
global $wpdb, $wp_db_version, $wp_current_db_version;
$guessurl = wp_guess_url();
@ -406,7 +409,7 @@ function populate_options() {
$timezone_string = $offset_or_tz;
}
$options = array(
$defaults = array(
'siteurl' => $guessurl,
'home' => $guessurl,
'blogname' => __( 'My Site' ),
@ -542,17 +545,19 @@ function populate_options() {
// 3.3
if ( ! is_multisite() ) {
$options['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
$defaults['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
? $wp_current_db_version : $wp_db_version;
}
// 3.0 multisite
if ( is_multisite() ) {
/* translators: site tagline */
$options['blogdescription'] = sprintf( __( 'Just another %s site' ), get_network()->site_name );
$options['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
$defaults['blogdescription'] = sprintf( __( 'Just another %s site' ), get_network()->site_name );
$defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
}
$options = wp_parse_args( $options, $defaults );
// Set autoload to no for these options
$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-alpha-43623';
$wp_version = '5.0-alpha-43627';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.