Ticket #19159: 19159.5.diff

wp-admin/admin-ajax.php

@@ -56 +56 @@
         'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
         'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
         'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-        'save-widget', 'set-post-thumbnail', 'date_format', 'time_format',
+        'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',
         'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
         'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
         'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',

wp-admin/css/widgets.css

@@ -203 +203 @@
         margin-top: 40px;
 }
 
+#widgets-left .inactive-sidebar .remove-inactive-widgets {
+        clear: both;
+}
+
 /* Not sure what this is for... */
 div#widgets-left .inactive-sidebar .widget.expanded {
         left: auto;
@@ -346 +350 @@
 
 .js .widgets-holder-wrap.closed .widget,
 .js .widgets-holder-wrap.closed .sidebar-description,
+.js .widgets-holder-wrap.closed .remove-inactive-widgets,
 .js .closed br.clear {
         display: none;
 }

wp-admin/includes/ajax-actions.php

@@ -1928 +1928 @@
         $wp_customize->widgets->wp_ajax_update_widget();
 }
 
+function wp_ajax_delete_inactive_widgets() {
+        check_ajax_referer( 'remove-inactive-widgets', 'removeinactivewidgets' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) )
+                wp_die( -1 );
+
+        unset( $_POST['removeinactivewidgets'], $_POST['action'] );
+
+        do_action( 'load-widgets.php' );
+        do_action( 'widgets.php' );
+        do_action( 'sidebar_admin_setup' );
+
+        $sidebars_widgets = wp_get_sidebars_widgets();
+
+        foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+                $pieces = explode( '-', $widget_id );
+                $multi_number = array_pop( $pieces );
+                $id_base = implode( '-', $pieces );
+                $widget = get_option( 'widget_' . $id_base );
+                unset( $widget[$multi_number] );
+                update_option( 'widget_' . $id_base, $widget );
+                unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+        }
+
+        wp_set_sidebars_widgets( $sidebars_widgets );
+
+        wp_die();
+}
+
 /**
  * Ajax handler for uploading attachments
  *

wp-admin/js/widgets.js

@@ -80 +80 @@
                                 widget.removeClass( 'open' );
                                 wpWidgets.close( widget );
                                 e.preventDefault();
+                        } else if ( target.attr( 'id' ) == 'inactive-widgets-control-remove' ) {
+                                wpWidgets.removeInactiveWidgets();
+                                e.preventDefault();
                         }
                 });
 
@@ -446 +449 @@
                 });
         },
 
+        removeInactiveWidgets : function() {
+                var sb = $( '.inactive-sidebar' ), a, data;
+
+                $( '.spinner', sb ).addClass( 'is-active' );
+
+                a = {
+                        action : 'delete-inactive-widgets',
+                        removeinactivewidgets : $( '#_wpnonce_remove_inactive_widgets' ).val()
+                };
+
+                data = $.param( a );
+
+                $.post( ajaxurl, data, function() {
+                        $( '.spinner', sb ).removeClass(' is-active' );
+                        $( '#wp_inactive_widgets .widget' ).remove();
+                } );
+        },
+
         appendTitle : function(widget) {
                 var title = $('input[id*="-title"]', widget).val() || '';
 

wp-admin/widgets.php

@@ -183 +183 @@
         exit;
 }
 
+// Remove inactive widgets without js
+if ( isset( $_POST['removeinactivewidgets'] ) ) {
+        check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
+
+        if ( $_POST['removeinactivewidgets'] ) {
+                foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
+                        $pieces = explode( '-', $widget_id );
+                        $multi_number = array_pop( $pieces );
+                        $id_base = implode( '-', $pieces );
+                        $widget = get_option( 'widget_' . $id_base );
+                        unset( $widget[$multi_number] );
+                        update_option( 'widget_' . $id_base, $widget );
+                        unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+                }
+
+                wp_set_sidebars_widgets( $sidebars_widgets );
+        }
+
+        wp_redirect( admin_url( 'widgets.php?message=0' ) );
+        exit;
+}
+
 // Output the widget form without js
 if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
         $widget_id = $_GET['editwidget'];
@@ -377 +399 @@
                 <div class="<?php echo esc_attr( $wrap_class ); ?>">
                         <div class="widget-holder inactive">
                                 <?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
-                                <div class="clear"></div>
+                                <div class="remove-inactive-widgets">
+                                        <form action="" method="post">
+                                                <p><?php submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, array( 'id' => 'inactive-widgets-control-remove' ) ); ?></p>
+                                                <p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+                                                <?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+                                        </form>
+                                </div>
                         </div>
                 </div>
                 <?php