Ticket #40642: 40642.diff

src/wp-admin/includes/schema.php

@@ -388 +388 @@
         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;
+                $timezone_string = $offset_or_tz;
 
         $options = array(
-        'siteurl' => $guessurl,
-        'home' => $guessurl,
-        'blogname' => __('My Site'),
-        /* translators: site tagline */
-        'blogdescription' => __('Just another WordPress site'),
-        'users_can_register' => 0,
-        'admin_email' => 'you@example.com',
-        /* 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,
-        'comments_notify' => 1,
-        'posts_per_rss' => 10,
-        'rss_use_excerpt' => 0,
-        'mailserver_url' => 'mail.example.com',
-        'mailserver_login' => 'login@example.com',
-        'mailserver_pass' => 'password',
-        'mailserver_port' => 110,
-        'default_category' => 1,
-        'default_comment_status' => 'open',
-        'default_ping_status' => 'open',
-        'default_pingback_flag' => 1,
-        'posts_per_page' => 10,
-        /* translators: default date format, see https://secure.php.net/date */
-        'date_format' => __('F j, Y'),
-        /* translators: default time format, see https://secure.php.net/date */
-        'time_format' => __('g:i a'),
-        /* 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' => '',
-        'rewrite_rules' => '',
-        'hack_file' => 0,
-        'blog_charset' => 'UTF-8',
-        'moderation_keys' => '',
-        'active_plugins' => array(),
-        'category_base' => '',
-        'ping_sites' => 'http://rpc.pingomatic.com/',
-        'comment_max_links' => 2,
-        'gmt_offset' => $gmt_offset,
-
-        // 1.5
-        'default_email_category' => 1,
-        'recently_edited' => '',
-        'template' => $template,
-        'stylesheet' => $stylesheet,
-        'comment_whitelist' => 1,
-        'blacklist_keys' => '',
-        'comment_registration' => 0,
-        'html_type' => 'text/html',
-
-        // 1.5.1
-        'use_trackback' => 0,
-
-        // 2.0
-        'default_role' => 'subscriber',
-        'db_version' => $wp_db_version,
-
-        // 2.0.1
-        'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
-        'upload_path' => '',
-
-        // 2.1
-        'blog_public' => '1',
-        'default_link_category' => 2,
-        'show_on_front' => 'posts',
-
-        // 2.2
-        'tag_base' => '',
-
-        // 2.5
-        'show_avatars' => '1',
-        'avatar_rating' => 'G',
-        'upload_url_path' => '',
-        'thumbnail_size_w' => 150,
-        'thumbnail_size_h' => 150,
-        'thumbnail_crop' => 1,
-        'medium_size_w' => 300,
-        'medium_size_h' => 300,
-
-        // 2.6
-        'avatar_default' => 'mystery',
-
-        // 2.7
-        'large_size_w' => 1024,
-        'large_size_h' => 1024,
-        'image_default_link_type' => 'none',
-        'image_default_size' => '',
-        'image_default_align' => '',
-        'close_comments_for_old_posts' => 0,
-        'close_comments_days_old' => 14,
-        'thread_comments' => 1,
-        'thread_comments_depth' => 5,
-        'page_comments' => 0,
-        'comments_per_page' => 50,
-        'default_comments_page' => 'newest',
-        'comment_order' => 'asc',
-        'sticky_posts' => array(),
-        'widget_categories' => array(),
-        'widget_text' => array(),
-        'widget_rss' => array(),
-        'uninstall_plugins' => array(),
-
-        // 2.8
-        'timezone_string' => $timezone_string,
-
-        // 3.0
-        'page_for_posts' => 0,
-        'page_on_front' => 0,
-
-        // 3.1
-        'default_post_format' => 0,
-
-        // 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,
+                'siteurl'                         => array( $guessurl, 'yes' ),
+                'home'                            => array( $guessurl, 'yes' ),
+                'blogname'                        => array( __( 'My Site' ), 'yes' ),
+                /* translators: site tagline */
+                'blogdescription'                 => array( __( 'Just another WordPress site' ), 'yes' ),
+                'users_can_register'              => array( 0, 'yes' ),
+                'admin_email'                     => array( 'you@example.com', 'yes' ),
+                /* translators: default start of the week. 0 = Sunday, 'yes' ), 1 = Monday */
+                'start_of_week'                   => array( _x( '1', 'no', 'start of week' ), 'yes' ),
+                'use_balanceTags'                 => array( 0, 'yes' ),
+                'use_smilies'                     => array( 1, 'yes' ),
+                'require_name_email'              => array( 1, 'yes' ),
+                'comments_notify'                 => array( 1, 'yes' ),
+                'posts_per_rss'                   => array( 10, 'yes' ),
+                'rss_use_excerpt'                 => array( 0, 'yes' ),
+                'mailserver_url'                  => array( 'mail.example.com', 'yes' ),
+                'mailserver_login'                => array( 'login@example.com', 'yes' ),
+                'mailserver_pass'                 => array( 'password', 'yes' ),
+                'mailserver_port'                 => array( 110, 'yes' ),
+                'default_category'                => array( 1, 'yes' ),
+                'default_comment_status'          => array( 'open', 'yes' ),
+                'default_ping_status'             => array( 'open', 'yes' ),
+                'default_pingback_flag'           => array( 1, 'yes' ),
+                'posts_per_page'                  => array( 10, 'yes' ),
+                /* translators: default date format, 'yes' ), see https://secure.php.net/date */
+                'date_format'                     => array( __( 'F j, Y' ), 'yes' ),
+                /* translators: default time format, 'yes' ), see https://secure.php.net/date */
+                'time_format'                     => array( __( 'g:i a' ), 'yes' ),
+                /* translators: links last updated date format, 'yes' ), see https://secure.php.net/date */
+                'links_updated_date_format'       => array( __( 'F j, Y g:i a' ), 'yes' ),
+                'comment_moderation'              => array( 0, 'yes' ),
+                'moderation_notify'               => array( 1, 'yes' ),
+                'permalink_structure'             => array( '', 'yes' ),
+                'rewrite_rules'                   => array( '', 'yes' ),
+                'hack_file'                       => array( 0, 'yes' ),
+                'blog_charset'                    => array( 'UTF-8', 'yes' ),
+                'moderation_keys'                 => array( '', 'no' ),
+                'active_plugins'                  => array( array(), 'yes' ),
+                'category_base'                   => array( '', 'yes' ),
+                'ping_sites'                      => array( 'http://rpc.pingomatic.com/', 'yes' ),
+                'comment_max_links'               => array( 2, 'yes' ),
+                'gmt_offset'                      => array( $gmt_offset, 'yes' ),
+
+                // 1.5
+                'default_email_category'          => array( 1, 'yes' ),
+                'recently_edited'                 => array( '', 'no' ),
+                'template'                        => array( $template, 'yes' ),
+                'stylesheet'                      => array( $stylesheet, 'yes' ),
+                'comment_whitelist'               => array( 1, 'yes' ),
+                'blacklist_keys'                  => array( '', 'no' ),
+                'comment_registration'            => array( 0, 'yes' ),
+                'html_type'                       => array( 'text/html', 'yes' ),
+
+                // 1.5.1
+                'use_trackback'                   => array( 0, 'yes' ),
+
+                // 2.0
+                'default_role'                    => array( 'subscriber', 'yes' ),
+                'db_version'                      => array( $wp_db_version, 'yes' ),
+
+                // 2.0.1
+                'uploads_use_yearmonth_folders'   => array( $uploads_use_yearmonth_folders, 'yes' ),
+                'upload_path'                     => array( '', 'yes' ),
+
+                // 2.1
+                'blog_public'                     => array( '1', 'yes' ),
+                'default_link_category'           => array( 2, 'yes' ),
+                'show_on_front'                   => array( 'posts', 'yes' ),
+
+                // 2.2
+                'tag_base'                        => array( '', 'yes' ),
+
+                // 2.5
+                'show_avatars'                    => array( '1', 'yes' ),
+                'avatar_rating'                   => array( 'G', 'yes' ),
+                'upload_url_path'                 => array( '', 'yes' ),
+                'thumbnail_size_w'                => array( 150, 'yes' ),
+                'thumbnail_size_h'                => array( 150, 'yes' ),
+                'thumbnail_crop'                  => array( 1, 'yes' ),
+                'medium_size_w'                   => array( 300, 'yes' ),
+                'medium_size_h'                   => array( 300, 'yes' ),
+
+                // 2.6
+                'avatar_default'                  => array( 'mystery', 'yes' ),
+
+                // 2.7
+                'large_size_w'                    => array( 1024, 'yes' ),
+                'large_size_h'                    => array( 1024, 'yes' ),
+                'image_default_link_type'         => array( 'none', 'yes' ),
+                'image_default_size'              => array( '', 'yes' ),
+                'image_default_align'             => array( '', 'yes' ),
+                'close_comments_for_old_posts'    => array( 0, 'yes' ),
+                'close_comments_days_old'         => array( 14, 'yes' ),
+                'thread_comments'                 => array( 1, 'yes' ),
+                'thread_comments_depth'           => array( 5, 'yes' ),
+                'page_comments'                   => array( 0, 'yes' ),
+                'comments_per_page'               => array( 50, 'yes' ),
+                'default_comments_page'           => array( 'newest', 'yes' ),
+                'comment_order'                   => array( 'asc', 'yes' ),
+                'sticky_posts'                    => array( array(), 'yes' ),
+                'widget_categories'               => array( array(), 'yes' ),
+                'widget_text'                     => array( array(), 'yes' ),
+                'widget_rss'                      => array( array(), 'yes' ),
+                'uninstall_plugins'               => array( array(), 'no' ),
+
+                // 2.8
+                'timezone_string'                 => array( $timezone_string, 'yes' ),
+
+                // 3.0
+                'page_for_posts'                  => array( 0, 'yes' ),
+                'page_on_front'                   => array( 0, 'yes' ),
+
+                // 3.1
+                'default_post_format'             => array( 0, 'yes' ),
+
+                // 3.5
+                'link_manager_enabled'            => array( 0, 'yes' ),
+
+                // 4.3.0
+                'finished_splitting_shared_terms' => array( 1, 'yes' ),
+                'site_icon'                       => array( 0, 'yes' ),
+
+                // 4.4.0
+                'medium_large_size_w'             => array( 768, 'yes' ),
+                'medium_large_size_h'             => array( 0, 'yes' ),
         );
 
         // 3.3
         if ( ! is_multisite() ) {
-                $options['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+                $initial_db_version            = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
                         ? $wp_current_db_version : $wp_db_version;
+                $options['initial_db_version'] = array( $initial_db_version, 'yes' );
         }
 
         // 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%/';
+                $options['blogdescription']     = array(
+                        sprintf( __( 'Just another %s site' ), get_network()->site_name ),
+                        'yes'
+                );
+                $options['permalink_structure'] = array(
+                        '/%year%/%monthnum%/%day%/%postname%/',
+                        'yes'
+                );
         }
 
-        // Set autoload to no for these options
-        $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
+        $options = apply_filters( 'default_options', $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 ) {
-                if ( in_array($option, $existing_options) )
+        foreach ( $options as $option_name => $option ) {
+                if ( in_array( $option_name, $existing_options ) ) {
                         continue;
-                if ( in_array($option, $fat_options) )
-                        $autoload = 'no';
-                else
-                        $autoload = 'yes';
+                }
+                $value    = array_shift( $option );
+                $autoload = array_shift( $option );
 
                 if ( is_array($value) )
                         $value = serialize($value);
                 if ( !empty($insert) )
                         $insert .= ', ';
-                $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+                $insert .= $wpdb->prepare( "(%s, %s, %s)", $option_name, $value, $autoload );
         }
 
         if ( !empty($insert) )