Changeset 10784

Timestamp:

03/14/2009 04:34:08 PM (16 years ago)

Author:

ryan

Message:

Convert search to WP_Widget. Handle upgrade of widgets without settings. Make form and update override optional. see #8441

File:

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

trunk/wp-includes/widgets.php

@@ -74 +74 @@
      *  The newly calculated value of $instance should be returned. */
     function update($new_instance, $old_instance) {
-        die('function WP_Widget::update() must be over-ridden in a sub-class.');
+        return $new_instance;
     }
 
     /** Echo a control form for the current instance. */
     function form($instance) {
-        die('function WP_Widget::form() must be over-ridden in a sub-class.');
+        echo '<p>' . __('There are no options for this widget.') . '</p>';
     }
 
@@ -252 +252 @@
 
         if ( !is_array($settings) )
-            return array();
+            $settings = array();
 
         if ( !array_key_exists('_multiwidget', $settings) ) {
@@ -889 +889 @@
     // This test may need expanding.
     $single = false;
-    foreach ( array_keys($settings) as $number ) {
-        if ( !is_numeric($number) ) {
-            $single = true;
-            break;
+    if ( empty($settings) ) {
+        $single = true;
+    } else {
+        foreach ( array_keys($settings) as $number ) {
+            if ( !is_numeric($number) ) {
+                $single = true;
+                break;
+            }
         }
     }
@@ -1007 +1011 @@
  */
 class WP_Widget_Links extends WP_Widget {
-    
+
+    function WP_Widget_Links() {
+        $widget_ops = array('description' => __( "Your blogroll" ) );
+        $this->WP_Widget('links', __('Links'), $widget_ops);
+    }
+
     function widget( $args, $instance ) {
         extract($args, EXTR_SKIP);
@@ -1061 +1070 @@
 
 /**
- * Display search widget.
- *
- * @since 2.2.0
- *
- * @param array $args Widget arguments.
- */
-function wp_widget_search($args) {
-    extract($args);
-    echo $before_widget;
-
-    // Use current theme search form if it exists
-    get_search_form();
-
-    echo $after_widget;
+ * Search widget class
+ *
+ * @since 2.8.0
+ */
+class WP_Widget_Search extends WP_Widget {
+
+    function WP_Widget_Search() {
+        $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") );
+        $this->WP_Widget('search', __('Search'), $widget_ops);
+    }
+
+    function widget( $args, $instance ) {
+        extract($args);
+        echo $before_widget;
+
+        // Use current theme search form if it exists
+        get_search_form();
+
+        echo $after_widget; 
+    }
 }
 
@@ -2229 +2244 @@
     wp_register_widget_control('archives', __('Archives'), 'wp_widget_archives_control' );
 
-    $widget_ops = array('description' => __( "Your blogroll" ) );
-    $wp_widget_links = new WP_Widget_Links('links', __('Links'), $widget_ops);
-    //$wp_widget_links->register();
+    new WP_Widget_Links();
 
     $widget_ops = array('classname' => 'widget_meta', 'description' => __( "Log in/out, admin, feed and WordPress links") );
@@ -2237 +2250 @@
     wp_register_widget_control('meta', __('Meta'), 'wp_widget_meta_control' );
 
-    $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") );
-    wp_register_sidebar_widget('search', __('Search'), 'wp_widget_search', $widget_ops);
+    new WP_Widget_Search();
 
     $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") );