Ticket #6291: 6291.diff

wp-includes/widgets.php

@@ -638 +638 @@
                 <p>
                         <input class="widefat" id="text-title-<?php echo $number; ?>" name="widget-text[<?php echo $number; ?>][title]" type="text" value="<?php echo $title; ?>" />
                         <textarea class="widefat" rows="16" cols="20" id="text-text-<?php echo $number; ?>" name="widget-text[<?php echo $number; ?>][text]"><?php echo $text; ?></textarea>
-                        <input type="hidden" id="text-submit-<?php echo $number; ?>" name="text-submit-<?php echo $number; ?>" value="1" />
+                        <input type="hidden" name="widget-text[<?php echo $number; ?>][submit]" value="1" />
                 </p>
 <?php
 }
@@ -798 +798 @@
                                 </label>
                         </p>
 
-                        <input type="hidden" id="categories-submit-<?php echo $number; ?>" name="categories-submit-<?php echo $number; ?>" value="1" />
+                        <input type="hidden" name="widget-categories[<?php echo $number; ?>][submit]" value="1" />
 <?php
 }
 
@@ -1254 +1254 @@
                         <?php _e('Display item date?'); ?>
                 </label>
         </p>
-        <input type="hidden" id="rss-submit-<?php echo $number; ?>" name="rss-submit-<?php echo $number; ?>" value="1" />
+        <input type="hidden" name="widget-rss[<?php echo $number; ?>][submit]" value="1" />
 <?php
         endif;
         foreach ( array_keys($default_inputs) as $input ) :
@@ -1483 +1483 @@
 ?>
                 <p>
                         <input class="widefat" id="widget-many-something-<?php echo $number; ?>" name="widget-many[<?php echo $number; ?>][something]" type="text" value="<?php echo $data; ?>" />
-                        <input type="hidden" id="widget-many-submit-<?php echo $number; ?>" name="widget-many-<?php echo $number; ?>" value="1" />
+                        <input type="hidden" id="widget-many-submit-<?php echo $number; ?>" name="widget-many[<?php echo $number; ?>][submit]" value="1" />
                 </p>
 <?php
 }

wp-includes/script-loader.php

@@ -180 +180 @@
                                 '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' ), '20080313' );
+                        $this->add( 'admin-widgets', '/wp-admin/js/widgets.js', array( 'interface' ), '20080319' );
                         $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[]"]' ).attr( 'disabled', 'disabled' ); }
+                                if ( disableFields ) { t.find( ':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[]"]' ).attr( 'disabled', 'disabled' ); }
+                                if ( disableFields ) { t.find( ':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 );