From d85d717aedbc7690e2a450e40dab8fcebd94b38c Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 30 Oct 2007 16:49:38 +0000
Subject: Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/widgets.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'wp-includes/widgets.php')

diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index c9f2404..10d1e3d 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -18,7 +18,9 @@ function register_sidebars($number = 1, $args = array()) {
 	if ( is_string($args) )
 		parse_str($args, $args);
 
-	for ( $i=1; $i <= $number; $i++ ) {
+	$i = 1;
+
+	while ( $i <= $number ) {
 		$_args = $args;
 		if ( $number > 1 ) {
 			$_args['name'] = isset($args['name']) ? $args['name'] : sprintf(__('Sidebar %d'), $i);
@@ -27,6 +29,7 @@ function register_sidebars($number = 1, $args = array()) {
 		}
 		$_args['id'] = isset($args['id']) ? $args['id'] : "sidebar-$i";
 		register_sidebar($_args);
+		++$i;
 	}
 }
 
@@ -627,7 +630,7 @@ function wp_widget_categories($args, $number = 1) {
 		wp_dropdown_categories($cat_args . '&show_option_none= ' . __('Select Category'));
 ?>
 
-<script type='text/javascript'><!--
+<script lang='javascript'><!--
     var dropdown = document.getElementById("cat");
     function onCatChange() {
 		if ( dropdown.options[dropdown.selectedIndex].value > 0 ) {
-- 
cgit