Changeset 19061

Timestamp:

10/25/2011 05:48:09 AM (13 years ago)

Author:

nacin

Message:

Introduce upgrade_330() to clear usermeta keys show_admin_bar_admin and plugins_last_view. fixes #18811.

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (2 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -452 +452 @@
         upgrade_300();
 
-    if ( $wp_current_db_version < 11548 )
-        upgrade_old_widgets_order_array();
+    if ( $wp_current_db_version < 19061 )
+        upgrade_330();
 
     maybe_disable_automattic_widgets();
@@ -1194 +1194 @@
             $sidebars_widgets['array_version'] = 3;
             update_option( 'sidebars_widgets', $sidebars_widgets );
+    }
+}
+
+/**
+ * Execute changes made in WordPress 3.3.
+ *
+ * @since 3.3.0
+ */
+function upgrade_330() {
+    global $wp_current_db_version, $wpdb;
+
+    if ( $wp_current_db_version < 11548 ) {
+        
+    }
+
+    if ( $wp_current_db_version < 19061 && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+        $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
     }
 }

trunk/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.3-beta2-19055';
+$wp_version = '3.3-beta2-19061';
 
 /**
@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 18715;
+$wp_db_version = 19061;
 
 /**