Changeset 11498 for trunk/wp-admin/admin-ajax.php

Timestamp:

05/31/2009 11:34:08 AM (16 years ago)

Author:

azaozz

Message:

Reload the widget form with the ajax response after save, add Close link to the widgets, don't auto-close on save to show possible errors returned from validation

File:

• trunk/wp-admin/admin-ajax.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -1290 +1290 @@
     $widget_id = $_POST['widget-id'];
     $sidebar_id = $_POST['sidebar'];
+    $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
+    $settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
+    $error = '<p>' . __('An error has occured. Please reload the page and try again.') . '</p>';
 
     $sidebars = wp_get_sidebars_widgets();
@@ -1298 +1301 @@
 
         if ( !isset($wp_registered_widgets[$widget_id]) )
-            die('-1');
+            die($error);
 
         $sidebar = array_diff( $sidebar, array($widget_id) );
         $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+    } elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
+        if ( !$multi_number )
+            die($error);
+
+        $_POST['widget-' . $id_base] = array( $multi_number => array_shift($settings) );
+        $widget_id = $id_base . '-' . $multi_number;
+        $sidebar[] = $widget_id;
     }
     $_POST['widget-id'] = $sidebar;
@@ -1325 +1335 @@
     }
 
-    die('1');
+    if ( !empty($_POST['add_new']) )
+        die();
+
+    if ( $form = $wp_registered_widget_controls[$widget_id] )
+        call_user_func_array( $form['callback'], $form['params'] );
+
+    die();
     break;
 default :