Changeset 18821 for trunk/wp-includes/widgets.php

Timestamp:

09/29/2011 09:41:22 PM (14 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-includes/widgets.php (modified) (4 diffs)

trunk/wp-includes/widgets.php

@@ -999 +999 @@
         _deprecated_argument( __FUNCTION__, '2.8.1' );
 
-    global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
+    global $wp_registered_widgets, $_wp_sidebars_widgets, $sidebars_widgets;
 
     // If loading from front page, consult $_wp_sidebars_widgets rather than options
@@ -1010 +1010 @@
     } else {
         $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();
-        }
     }
 
@@ -1220 +1171 @@
         remove_theme_mod( 'sidebars_widgets' );
     } else {
-        if ( ! is_array( $sidebars_widgets ) )
-            $sidebars_widgets = wp_get_sidebars_widgets();
+        if ( empty( $sidebars_widgets ) )
+            return;
 
         $sidebars = array_keys($wp_registered_sidebars);
@@ -1235 +1186 @@
 
         $_sidebars_widgets = array(
-            'wp_inactive_widgets' => $sidebars_widgets['wp_inactive_widgets']
+            'wp_inactive_widgets' => !empty( $sidebars_widgets['wp_inactive_widgets'] ) ? $sidebars_widgets['wp_inactive_widgets'] : array()
         );
 
         unset( $sidebars_widgets['wp_inactive_widgets'] );
 
-        foreach ( $wp_registered_sidebars as $id => $settings ) {
-            if ( ! empty( $sidebars_widgets ) )
-                $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
-        }
-
-        if ( !empty($sidebars_widgets) ) {
-            $orphaned = 0;
-
-            foreach ( $sidebars_widgets as $val ) {
-                if ( is_array($val) && ! empty( $val ) )
-                    $_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
-            }
+        foreach ( $wp_registered_sidebars as $id => $settings )
+            $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+
+        $orphaned = 0;
+
+        foreach ( $sidebars_widgets as $val ) {
+            if ( is_array($val) && ! empty( $val ) )
+                $_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
         }
     }