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

Timestamp:

03/13/2009 10:27:38 PM (17 years ago)

Author:

azaozz

Message:

WP_Widgets: make save_settings() and get_settings() separate methods, convert defined single widgets settings to multi-widget format, small fixes for the Links widget, see #8441

File:

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

trunk/wp-includes/widgets.php

@@ -656 +656 @@
 
         return $defaults;
+}
+
+/**
+ * Convert the widget settings from single to multi-widget format.
+ *
+ * @since 2.8.0
+ *
+ * @return array
+ */
+function wp_convert_widget_settings($base_name, $option_name, $settings) {
+        // This test may need expanding.
+        $single = false;
+        foreach ( array_keys($settings) as $number ) {
+                if ( !is_numeric($number) ) {
+                        $single = true;
+                        break;
+                }
+        }
+
+        if ( $single ) {
+                $settings = array( 2 => $settings );
+                
+                $sidebars_widgets = get_option('sidebars_widgets');
+                foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+                        if ( is_array($sidebar) ) {
+                                foreach ( $sidebar as $i => $name ) {
+                                        if ( $base_name == $name ) {
+                                                $sidebars_widgets[$index][$i] = "$name-2";
+                                                break 2;
+                                        }
+                                }
+                        }
+                }
+
+                update_option('sidebars_widgets', $sidebars_widgets);
+        }
+
+        $settings['_multiwidget'] = 1;
+        update_option( $option_name, $settings );
+        
+        return $settings;
 }
 
@@ -768 +809 @@
                         return false;
 
-                return $new_instance;
+                $new_instance = (array) $new_instance;
+                $instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0);
+                foreach ( $instance as $field => $val ) {
+                        if ( isset($new_instance[$field]) )
+                                $instance[$field] = 1;
+                }
+        
+                return $instance;
         }
         
@@ -775 +823 @@
                 //Defaults
                 $instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false) );
-/*
-                if ( isset($_POST['links-submit']) ) {
-                        $newoptions = array();
-                        $newoptions['description'] = isset($_POST['links-description']);
-                        $newoptions['name'] = isset($_POST['links-name']);
-                        $newoptions['rating'] = isset($_POST['links-rating']);
-                        $newoptions['images'] = isset($_POST['links-images']);
-
-                        if ( $instance != $newoptions ) {
-                                $instance = $newoptions;
-                                update_option('widget_links', $instance);
-                        }
-                }
-*/
 ?>
                 <p>
@@ -1976 +2010 @@
         $widget_ops = array('description' => __( "Your blogroll" ) );
         $wp_widget_links = new WP_Widget_Links('links', __('Links'), $widget_ops);
-        $wp_widget_links->register();
+        //$wp_widget_links->register();
 
         $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );