Ticket #18693: 18693.4.diff

wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 19364;
+$wp_db_version = 19365;
 
 /**
  * Holds the TinyMCE version

wp-admin/includes/upgrade.php

@@ -1146 +1146 @@
                 $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
         }
 
+        if ( $wp_current_db_version < 19383 && is_multisite() && is_main_site() ) {
+                // populate_options() will handle single-site.
+                update_site_option( 'initial_db_version', $wp_current_db_version );
+        }
+
         if ( $wp_current_db_version >= 11548 )
                 return;
 

wp-admin/includes/schema.php

@@ -330 +330 @@
  * @uses $wp_db_version
  */
 function populate_options() {
-        global $wpdb, $wp_db_version, $current_site;
+        global $wpdb, $wp_db_version, $current_site, $wp_db_current_db_version;
 
         $guessurl = wp_guess_url();
 
@@ -480 +480 @@
         'default_post_format' => 0,
         );
 
+        // 3.3
+        if ( ! is_multisite() ) {
+                $options['initial_db_version'] = ! empty( $wp_db_current_db_version ) && $wp_current_db_version < $wp_db_version
+                        ? $wp_current_db_version : $wp_db_version;
+        }
+
         // 3.0 multisite
         if ( is_multisite() ) {
                 /* translators: blog tagline */
@@ -886 +892 @@
                 'add_new_users' => '0',
                 'upload_space_check_disabled' => '0',
                 'subdomain_install' => intval( $subdomain_install ),
-                'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
+                'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
+                'initial_db_version' => get_option( 'initial_db_version' ),
         );
         if ( ! $subdomain_install )
                 $sitemeta['illegal_names'][] = 'blog';