Changeset 10798

Timestamp:

03/17/2009 12:59:42 AM (16 years ago)

Author:

ryan

Message:

Separate widget form and update callbacks.

Location:

trunk

Files:

• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (9 diffs)

trunk/wp-admin/widgets.php

@@ -74 +74 @@
         $already_done = array();
 
-        foreach ( $wp_registered_widget_controls as $name => $control ) {
+        foreach ( $wp_registered_widget_updates as $name => $control ) {
             if ( in_array( $control['callback'], $already_done ) )
                 continue;

trunk/wp-includes/default-widgets.php

@@ -217 +217 @@
 
         $instance = $old_instance;
+        $new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
         $instance['title'] = strip_tags($new_instance['title']);
         $instance['count'] = $new_instance['count'] ? 1 : 0;

trunk/wp-includes/widgets.php

@@ -17 +17 @@
 
 /** @ignore */
-global $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls;
+global $wp_registered_sidebars, $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
 
 /**
@@ -42 +42 @@
  */
 $wp_registered_widget_controls = array();
+$wp_registered_widget_updates = array();
 
 /**
@@ -153 +154 @@
     }
 
-    function _get_control_callback() {
-        return array(&$this, 'control_callback');
+    function _get_update_callback() {
+        return array(&$this, 'update_callback');
+    }
+
+    function _get_form_callback() {
+        return array(&$this, 'form_callback');
     }
 
@@ -172 +177 @@
     }
 
-    /** Deal with changed settings and generate the control form.
+    /** Deal with changed settings.
      *  Do NOT over-ride this function. */
-    function control_callback( $widget_args = 1 ) {
+    function update_callback( $widget_args = 1 ) {
         global $wp_registered_widgets;
 
@@ -224 +229 @@
             $this->updated = true;
         }
-
-        // Here we echo out the form
+    }
+
+    /** Generate the control form.
+     *  Do NOT over-ride this function. */
+    function form_callback( $widget_args = 1 ) {
+        if ( is_numeric($widget_args) )
+            $widget_args = array( 'number' => $widget_args );
+
+        $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
+        $all_instances = $this->get_settings();
+
         if ( -1 == $widget_args['number'] ) {
             // We echo out a form where 'number' can be set later via JS
@@ -241 +255 @@
     function _register_one($number = -1) {
         wp_register_sidebar_widget( $this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
-        wp_register_widget_control( $this->id, $this->name, $this->_get_control_callback(), $this->control_options, array( 'number' => $number ) );
+        _register_widget_update_callback(   $this->id, $this->name, $this->_get_update_callback(), $this->control_options, array( 'number' => $number ) );
+        _register_widget_form_callback( $this->id, $this->name, $this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
     }
     
@@ -490 +505 @@
  */
 function wp_register_widget_control($id, $name, $control_callback, $options = array()) {
-    global $wp_registered_widget_controls;
+    global $wp_registered_widget_controls, $wp_registered_widget_updates;
 
     $id = strtolower($id);
@@ -496 +511 @@
     if ( empty($control_callback) ) {
         unset($wp_registered_widget_controls[$id]);
+        unset($wp_registered_widget_updates[$id]);
         return;
     }
@@ -511 +527 @@
         'id' => $id,
         'callback' => $control_callback,
+        'params' => array_slice(func_get_args(), 4)
+    );
+    $widget = array_merge($widget, $options);
+
+    $wp_registered_widget_controls[$id] = $wp_registered_widget_updates[$id] = $widget;
+}
+
+function _register_widget_update_callback($id, $name, $update_callback, $options = array()) {
+    global $wp_registered_widget_updates;
+
+    $id = strtolower($id);
+
+    if ( empty($update_callback) ) {
+        unset($wp_registered_widget_updates[$id]);
+        return;
+    }
+
+    if ( isset($wp_registered_widget_updates[$id]) && !did_action( 'widgets_init' ) )
+        return;
+
+    $defaults = array('width' => 250, 'height' => 200 ); // height is never used
+    $options = wp_parse_args($options, $defaults);
+    $options['width'] = (int) $options['width'];
+    $options['height'] = (int) $options['height'];
+
+    $widget = array(
+        'name' => $name,
+        'id' => $id,
+        'callback' => $update_callback,
+        'params' => array_slice(func_get_args(), 4)
+    );
+    $widget = array_merge($widget, $options);
+
+    $wp_registered_widget_updates[$id] = $widget;
+}
+
+function _register_widget_form_callback($id, $name, $form_callback, $options = array()) {
+    global $wp_registered_widget_controls;
+
+    $id = strtolower($id);
+
+    if ( empty($form_callback) ) {
+        unset($wp_registered_widget_controls[$id]);
+        return;
+    }
+
+    if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+        return;
+
+    $defaults = array('width' => 250, 'height' => 200 ); // height is never used
+    $options = wp_parse_args($options, $defaults);
+    $options['width'] = (int) $options['width'];
+    $options['height'] = (int) $options['height'];
+
+    $widget = array(
+        'name' => $name,
+        'id' => $id,
+        'callback' => $form_callback,
         'params' => array_slice(func_get_args(), 4)
     );