Changeset 22387

Timestamp:

11/05/2012 11:17:25 PM (12 years ago)

Author:

nacin

Message:

Prefix sidebar IDs on the widgets screen with "sidebar-". props batmoo. fixes #14466.

Location:

trunk/wp-admin

Files:

• includes/widgets.php (modified) (1 diff)
• js/widgets.js (modified) (3 diffs)

trunk/wp-admin/includes/widgets.php

@@ -68 +68 @@
     add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
 
-    echo "<div id='$sidebar' class='widgets-sortables'>\n";
+    echo "<div id='sidebar-$sidebar' class='widgets-sortables'>\n";
 
     $description = wp_sidebar_description( $sidebar );

trunk/wp-admin/js/widgets.js

@@ -116 +116 @@
                     n = ui.item.find('input.multi_number').val(),
                     id = the_id,
-                    sb = $(this).attr('id');
+                    sb = $(this).attr('id').replace(/^sidebar-/, '');
 
                 ui.item.css({margin:'', 'width':''});
@@ -187 +187 @@
         $('div.widgets-sortables').each( function() {
             if ( $(this).sortable )
-                a['sidebars[' + $(this).attr('id') + ']'] = $(this).sortable('toArray').join(',');
+                a['sidebars[' + $(this).attr('id').replace(/^sidebar-/, '') + ']'] = $(this).sortable('toArray').join(',');
         });
 
@@ -198 +198 @@
 
     save : function(widget, del, animate, order) {
-        var sb = widget.closest('div.widgets-sortables').attr('id'), data = widget.find('form').serialize(), a;
+        var sb = widget.closest('div.widgets-sortables').attr('id').replace(/^sidebar-/, ''), data = widget.find('form').serialize(), a;
         widget = $(widget);
         $('.spinner', widget).show();