Ticket #18693: 18693.5.diff

wp-admin/includes/upgrade.php

@@ -1151 +1151 @@
                 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
                         delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
 
+        if ( $wp_current_db_version < 19390 && is_main_site() ) {
+                update_site_option( 'initial_db_version', $wp_current_db_version );
+                // populate_options() will handle single-site.
+        }
 
+
         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';

wp-admin/includes/template.php

@@ -1677 +1677 @@
          *     remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp330_toolbar' ) );
          */
         public static function enqueue_scripts( $hook_suffix ) {
+                if ( get_site_option( 'initial_db_version' ) >= 99999 ) // Final db_version for 3.3.
+                        return;
+
                 /*
                  * Register feature pointers
                  * Format: array( hook_suffix => pointer_id )
                  */
+
                 $registered_pointers = array(
                         'index.php'    => 'wp330_toolbar',
                         'post-new.php' => 'wp330_media_uploader',