Changeset 43627

Timestamp:

09/05/2018 09:38:04 AM (6 years ago)

Author:

flixos90

Message:

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

Fixes #44893. See #41333.

Location:

trunk

Files:

• src/wp-admin/includes/schema.php (modified) (4 diffs)
• tests/phpunit/tests/admin/includesSchema.php (added)

trunk/src/wp-admin/includes/schema.php

@@ -357 +357 @@
  *
  * @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
- */
-function populate_options() {
+ *
+ * @param array $options Optional. Custom option $key => $value pairs to use. Default empty array.
+ */
+function populate_options( array $options = array() ) {
     global $wpdb, $wp_db_version, $wp_current_db_version;
 
@@ -407 +410 @@
     }
 
-    $options = array(
+    $defaults = array(
         'siteurl'                         => $guessurl,
         'home'                            => $guessurl,
@@ -543 +546 @@
     // 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;
     }
@@ -550 +553 @@
     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