Changeset 18821 for trunk/wp-admin/includes/upgrade.php

Timestamp:

09/29/2011 09:41:22 PM (15 years ago)

Author:

ryan

Message:

• Move the old sidebars_widgets array upgrade code to wp-admin/includes/upgrade.php
• Avoid infinite loop with wp_get_sidebars_widgets()
• Remove two unneeded wp_get_sidebars_widgets() calls
• Remove unused $wp_registered_sidebars variable from wp_get_sidebars_widgets().
• Combine a couple of !empty( $sidebars_widgets ) checks in retrieve_widgets()

Props SergeyBiryukov, lancewillett. fixes #17979 #18598

File:

• trunk/wp-admin/includes/upgrade.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();
+
         maybe_disable_automattic_widgets();
 
@@ -1130 +1133 @@
         }
 
+}
+
+/**
+ * Convert the old style widgets order array from 2.2.
+ *
+ * @since 3.3.0
+ */
+function upgrade_old_widgets_order_array() {
+        global $wp_registered_widgets, $sidebars_widgets;
+
+        $sidebars_widgets = get_option( 'sidebars_widgets', array() );
+        $_sidebars_widgets = array();
+
+        if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+                $sidebars_widgets['array_version'] = 3;
+        elseif ( !isset($sidebars_widgets['array_version']) )
+                $sidebars_widgets['array_version'] = 1;
+
+        switch ( $sidebars_widgets['array_version'] ) {
+                case 1 :
+                        foreach ( (array) $sidebars_widgets as $index => $sidebar )
+                        if ( is_array($sidebar) )
+                        foreach ( (array) $sidebar as $i => $name ) {
+                                $id = strtolower($name);
+                                if ( isset($wp_registered_widgets[$id]) ) {
+                                        $_sidebars_widgets[$index][$i] = $id;
+                                        continue;
+                                }
+                                $id = sanitize_title($name);
+                                if ( isset($wp_registered_widgets[$id]) ) {
+                                        $_sidebars_widgets[$index][$i] = $id;
+                                        continue;
+                                }
+
+                                $found = false;
+
+                                foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+                                        if ( strtolower($widget['name']) == strtolower($name) ) {
+                                                $_sidebars_widgets[$index][$i] = $widget['id'];
+                                                $found = true;
+                                                break;
+                                        } elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+                                                $_sidebars_widgets[$index][$i] = $widget['id'];
+                                                $found = true;
+                                                break;
+                                        }
+                                }
+
+                                if ( $found )
+                                        continue;
+
+                                unset($_sidebars_widgets[$index][$i]);
+                        }
+                        $_sidebars_widgets['array_version'] = 2;
+                        $sidebars_widgets = $_sidebars_widgets;
+                        unset($_sidebars_widgets);
+
+                case 2 :
+                        $sidebars_widgets = retrieve_widgets();
+                        $sidebars_widgets['array_version'] = 3;
+                        update_option( 'sidebars_widgets', $sidebars_widgets );
+        }
 }