Changeset 7620 for trunk/wp-includes/widgets.php

Timestamp:

04/07/2008 09:40:32 PM (17 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/widgets.php (modified) (4 diffs)

trunk/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