Changeset 7621

Timestamp:

04/07/2008 09:40:41 PM (18 years ago)

Author:

ryan

Message:

Avoid data-loss when editing multi-widgets. Props mdawaffe. fixes #6636 for 2.5

Location:

branches/2.5

Files:

• wp-admin/js/widgets.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (4 diffs)

branches/2.5/wp-admin/js/widgets.js

@@ -12 +12 @@
             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 );
@@ -26 +26 @@
 
             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 } );

branches/2.5/wp-includes/script-loader.php

@@ -188 +188 @@
                 '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'),

branches/2.5/wp-includes/widgets.php

@@ -615 +615 @@
 
         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') )
@@ -751 +753 @@
 
         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']);
@@ -1171 +1175 @@
 
         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']));
@@ -1461 +1467 @@
         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