From f10e3e59c5a3d89acf936d83ab46a2c6054853df Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Mon, 5 Nov 2012 23:17:25 +0000
Subject: [PATCH] Prefix sidebar IDs on the widgets screen with "sidebar-".
 props batmoo. fixes #14466.

git-svn-id: https://develop.svn.wordpress.org/trunk@22387 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/widgets.php | 2 +-
 wp-admin/js/widgets.js        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index e0c58a7277..6946595e8c 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -67,7 +67,7 @@ function _sort_name_callback( $a, $b ) {
 function wp_list_widget_controls( $sidebar ) {
 	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 );
 
diff --git a/wp-admin/js/widgets.js b/wp-admin/js/widgets.js
index 87be4ddfd5..158c226aa3 100644
--- a/wp-admin/js/widgets.js
+++ b/wp-admin/js/widgets.js
@@ -115,7 +115,7 @@ wpWidgets = {
 				var add = ui.item.find('input.add_new').val(),
 					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':''});
 				the_id = '';
@@ -186,7 +186,7 @@ wpWidgets = {
 
 		$('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(',');
 		});
 
 		$.post( ajaxurl, a, function() {
@@ -197,7 +197,7 @@ wpWidgets = {
 	},
 
 	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();