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

Timestamp:

04/24/2009 06:27:06 AM (17 years ago)

Author:

azaozz

Message:

Upgrade widget options only from admin, props ryan, fixes #9629

File:

• trunk/wp-includes/widgets.php (modified) (6 diffs)

trunk/wp-includes/widgets.php

@@ -341 +341 @@
 $wp_registered_widget_updates = array();
 
+/**
+ * Private
+ */
+$_wp_sidebars_widgets = array();
+
 /* Template tags & API functions */
 
@@ -837 +842 @@
  */
 function wp_get_sidebars_widgets($update = true) {
-        global $wp_registered_widgets, $wp_registered_sidebars;
-
-        $sidebars_widgets = get_option('sidebars_widgets', array());
+        global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets;
+
+        // If loading from front page, consult $_wp_sidebars_widgets rather than options
+        // to see if wp_convert_widget_settings() has made manipulations in memory.
+        if ( is_admin() ) {
+                $sidebars_widgets = get_option('sidebars_widgets', array());
+        } else {
+                if ( empty($_wp_sidebars_widgets) )
+                        $sidebars_widgets = get_option('sidebars_widgets', array());
+                else
+                        $sidebars_widgets = &$_wp_sidebars_widgets;
+        }
         $_sidebars_widgets = array();
 
@@ -905 +919 @@
                         }
 
-                        if ( $update )
+                        if ( $update && is_admin() )
                                 update_option('sidebars_widgets', $sidebars_widgets);
         }
@@ -957 +971 @@
  */
 function wp_convert_widget_settings($base_name, $option_name, $settings) {
+        global $_wp_sidebars_widgets;
         // This test may need expanding.
         $single = false;
@@ -975 +990 @@
                 $settings = array( 2 => $settings );
 
-                $sidebars_widgets = get_option('sidebars_widgets');
+                // If loading from the front page, update sidebar in memory but don't save to options
+                if ( is_admin() ) {
+                        $sidebars_widgets = get_option('sidebars_widgets');
+                } else {
+                        if ( empty($GLOBALS['_wp_sidebars_widgets']) )
+                                $GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets');
+                        $sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
+                }
+                
                 foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
                         if ( is_array($sidebar) ) {
@@ -987 +1010 @@
                 }
 
-                update_option('sidebars_widgets', $sidebars_widgets);
+                if ( is_admin() )
+                        update_option('sidebars_widgets', $sidebars_widgets);
         }
 
         $settings['_multiwidget'] = 1;
-        update_option( $option_name, $settings );
+        if ( is_admin() )
+                update_option( $option_name, $settings );
 
         return $settings;