Ticket #18693: 18693.5.diff
File 18693.5.diff, 2.5 KB (added by , 12 years ago) |
---|
-
wp-admin/includes/upgrade.php
1151 1151 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) 1152 1152 delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true ); 1153 1153 1154 if ( $wp_current_db_version < 19390 && is_main_site() ) { 1155 update_site_option( 'initial_db_version', $wp_current_db_version ); 1156 // populate_options() will handle single-site. 1157 } 1154 1158 1159 1155 1160 if ( $wp_current_db_version >= 11548 ) 1156 1161 return; 1157 1162 -
wp-admin/includes/schema.php
330 330 * @uses $wp_db_version 331 331 */ 332 332 function populate_options() { 333 global $wpdb, $wp_db_version, $current_site ;333 global $wpdb, $wp_db_version, $current_site, $wp_db_current_db_version; 334 334 335 335 $guessurl = wp_guess_url(); 336 336 … … 480 480 'default_post_format' => 0, 481 481 ); 482 482 483 // 3.3 484 if ( ! is_multisite() ) { 485 $options['initial_db_version'] = ! empty( $wp_db_current_db_version ) && $wp_current_db_version < $wp_db_version 486 ? $wp_current_db_version : $wp_db_version; 487 } 488 483 489 // 3.0 multisite 484 490 if ( is_multisite() ) { 485 491 /* translators: blog tagline */ … … 886 892 'add_new_users' => '0', 887 893 'upload_space_check_disabled' => '0', 888 894 'subdomain_install' => intval( $subdomain_install ), 889 'global_terms_enabled' => global_terms_enabled() ? '1' : '0' 895 'global_terms_enabled' => global_terms_enabled() ? '1' : '0', 896 'initial_db_version' => get_option( 'initial_db_version' ), 890 897 ); 891 898 if ( ! $subdomain_install ) 892 899 $sitemeta['illegal_names'][] = 'blog'; -
wp-admin/includes/template.php
1677 1677 * remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp330_toolbar' ) ); 1678 1678 */ 1679 1679 public static function enqueue_scripts( $hook_suffix ) { 1680 if ( get_site_option( 'initial_db_version' ) >= 99999 ) // Final db_version for 3.3. 1681 return; 1682 1680 1683 /* 1681 1684 * Register feature pointers 1682 1685 * Format: array( hook_suffix => pointer_id ) 1683 1686 */ 1687 1684 1688 $registered_pointers = array( 1685 1689 'index.php' => 'wp330_toolbar', 1686 1690 'post-new.php' => 'wp330_media_uploader',