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

Timestamp:

09/29/2011 09:41:22 PM (13 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/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -1249 +1249 @@
     global $wp_theme_directories, $sidebars_widgets;
 
-    if ( ! is_array( $sidebars_widgets ) )
-        $sidebars_widgets = wp_get_sidebars_widgets();
-    set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $sidebars_widgets ) );
+    if ( is_array( $sidebars_widgets ) )
+        set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $sidebars_widgets ) );
 
     $old_theme = get_current_theme();