Ticket #18693: 18693.3.diff
File 18693.3.diff, 2.3 KB (added by , 12 years ago) |
---|
-
wp-admin/includes/upgrade.php
1146 1146 $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" ); 1147 1147 } 1148 1148 1149 if ( $wp_current_db_version < 19382 && is_multisite() && is_main_site() ) { 1150 update_site_option( 'initial_db_version', get_option( 'initial_db_version' ) ); 1151 } 1152 1149 1153 if ( $wp_current_db_version >= 11548 ) 1150 1154 return; 1151 1155 -
wp-admin/includes/schema.php
480 480 'default_post_format' => 0, 481 481 ); 482 482 483 // 3.3 484 if ( ! is_multisite() || is_main_site( get_current_blog_id() ) ) { 485 $options['dismissed_wp_pointers'] = 'wp330-toolbar,wp330-media-uploader,wp330-saving-widgets'; 486 $wp_db_current_db_version = __get_option( 'db_version' ); 487 $options['initial_db_version'] = $wp_current_db_version < $wp_db_version ? $wp_current_db_version : $wp_db_version; 488 } 489 483 490 // 3.0 multisite 484 491 if ( is_multisite() ) { 485 492 /* translators: blog tagline */ … … 886 893 'add_new_users' => '0', 887 894 'upload_space_check_disabled' => '0', 888 895 'subdomain_install' => intval( $subdomain_install ), 889 'global_terms_enabled' => global_terms_enabled() ? '1' : '0' 896 'global_terms_enabled' => global_terms_enabled() ? '1' : '0', 897 'initial_wp_version' => get_option( 'initial_wp_version' ), 898 'dismissed_wp_pointers' => 'wp330-toolbar,wp330-media-uploader,wp330-saving-widgets', 890 899 ); 891 900 if ( ! $subdomain_install ) 892 901 $sitemeta['illegal_names'][] = 'blog'; -
wp-admin/includes/template.php
1676 1676 $enqueue = false; 1677 1677 1678 1678 $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ); 1679 $dismissed = array_unique( array_merge( $dismissed, explode( ',', (string) get_site_option( 'dismissed_wp_pointers' ) ) ) ); 1679 1680 1680 1681 if ( ! in_array( 'wp330-admin-bar', $dismissed ) ) { 1681 1682 $enqueue = true;