Ticket #6636: 6636.diff

wp-includes/widgets.php

@@ -614 +614 @@
                 }
 
                 foreach ( (array) $_POST['widget-text'] as $widget_number => $widget_text ) {
+                        if ( !isset($widget_text['text']) && isset($options[$widget_number]) ) // user clicked cancel
+                                continue;
                         $title = strip_tags(stripslashes($widget_text['title']));
                         if ( current_user_can('unfiltered_html') )
                                 $text = stripslashes( $widget_text['text'] );
@@ -750 +752 @@
                 }
 
                 foreach ( (array) $_POST['widget-categories'] as $widget_number => $widget_cat ) {
+                        if ( !isset($widget_cat['title']) && isset($options[$widget_number]) ) // user clicked cancel
+                                continue;
                         $title = trim(strip_tags(stripslashes($widget_cat['title'])));
                         $count = isset($widget_cat['count']);
                         $hierarchical = isset($widget_cat['hierarchical']);
@@ -1170 +1174 @@
                 }
 
                 foreach( (array) $_POST['widget-rss'] as $widget_number => $widget_rss ) {
+                        if ( !isset($widget_rss['url']) && isset($options[$widget_number]) ) // user clicked cancel
+                                continue;
                         $widget_rss = stripslashes_deep( $widget_rss );
                         $url = sanitize_url(strip_tags($widget_rss['url']));
                         $options[$widget_number] = wp_widget_rss_process( $widget_rss, !isset($urls[$url]) );
@@ -1460 +1466 @@
 
                 foreach ( (array) $_POST['widget-many'] as $widget_number => $widget_many_instance ) {
                         // compile data from $widget_many_instance
+                        if ( !isset($widget_many_instance['something']) && isset($options[$widget_number]) ) // user clicked cancel
+                                continue;
                         $something = wp_specialchars( $widget_many_instance['something'] );
                         $options[$widget_number] = array( 'something' => $something );  // Even simple widgets should store stuff in array, rather than in scalar
                 }

wp-includes/script-loader.php

@@ -187 +187 @@
                                 'saveText' => attribute_escape(__('Save »')),
                                 'confirmText' => __("Are you sure you want to delete the file '%title%'?\nClick ok to delete or cancel to go back.")
                         ) );
-                        $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080319' );
+                        $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080407c' );
                         $this->localize( 'admin-widgets', 'widgetsL10n', array(
                                 'add' => __('Add'),
                                 'edit' => __('Edit'),

wp-admin/js/widgets.js

@@ -11 +11 @@
                 var widgetAnim = $.browser.msie ? function() {
                         var t = $(this);
                         if ( t.is(':visible') ) {
-                                if ( disableFields ) { t.find( ':enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
+                                if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
                                 li.css( 'marginLeft', 0 );
                                 t.siblings('h4').children('a').text( widgetsL10n.edit );
                         } else {
@@ -25 +25 @@
                         var t = $(this);
 
                         if ( t.is(':visible') ) {
-                                if ( disableFields ) { t.find( ':enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
+                                if ( disableFields ) { t.find( ':input:enabled' ).not( '[name="widget-id[]"], [name*="[submit]"]' ).attr( 'disabled', 'disabled' ); }
                                 if ( width > 250 )
                                         li.animate( { marginLeft: 0 } );
                                 t.siblings('h4').children('a').text( widgetsL10n.edit );