Changeset 19062

Timestamp:

10/25/2011 05:50:39 AM (13 years ago)

Author:

nacin

Message:

Merge upgrade_old_widgets_order_array() into upgrade_330(). see #18811, see #18821.

File:

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

trunk/wp-admin/includes/upgrade.php

@@ -1136 +1136 @@
 
 /**
- * Convert the old style widgets order array from 2.2.
+ * Execute changes made in WordPress 3.3.
  *
  * @since 3.3.0
  */
-function upgrade_old_widgets_order_array() {
-    global $wp_registered_widgets, $sidebars_widgets;
+function upgrade_330() {
+    global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
+
+    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')" );
+    }
+
+    if ( $wp_current_db_version >= 11548 )
+        return;
 
     $sidebars_widgets = get_option( 'sidebars_widgets', array() );
@@ -1194 +1201 @@
             $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')" );
     }
 }