From 95029985a6eb10b23ebdfaa9ba7b40dd42096709 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 14 Mar 2010 12:12:23 +0000
Subject: [PATCH] Restore backwards compatibility of integer
 sidebars("sidebar-$i"). See #12606

git-svn-id: http://svn.automattic.com/wordpress/trunk@13701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/widgets.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index e1f57b72f..b213519d8 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -481,7 +481,6 @@ function register_sidebars($number = 1, $args = array()) {
 	if ( is_string($args) )
 		parse_str($args, $args);
 
-	$n = count($wp_registered_sidebars);
 	for ( $i = 1; $i <= $number; $i++ ) {
 		$_args = $args;
 
@@ -491,14 +490,16 @@ function register_sidebars($number = 1, $args = array()) {
 			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
 
 		// Custom specified ID's are suffixed if they exist already.
-		// Automatically generated sidebar names need to be suffixed regardless.
+		// Automatically generated sidebar names need to be suffixed regardless starting at -0
 		if ( isset($args['id']) ) {
 			$_args['id'] = $args['id'];
+			$n = 2; // Start at -2 for conflicting custom ID's
 			while ( isset($wp_registered_sidebars[$_args['id']]) )
 				$_args['id'] = $args['id'] . '-' . $n++;
 		} else {
+			$n = count($wp_registered_sidebars);
 			do {
-				$_args['id'] = 'sidebar-' . $n++;
+				$_args['id'] = 'sidebar-' . ++$n;
 			} while ( isset($wp_registered_sidebars[$_args['id']]) );
 		}
 		register_sidebar($_args);