From 310940b824eff4a116dcd72ccd339bb602021981 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 10 Jun 2008 14:08:54 +0000
Subject: Merge with branches/2.5 in WordPress, revision 8066

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

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

diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 9fa2630..1c356e6 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -710,10 +710,11 @@ function wp_widget_categories($args, $widget_args = 1) {
 	echo $before_widget;
 	echo $before_title . $title . $after_title;
 
-	$cat_args = "orderby=name&show_count={$c}&hierarchical={$h}";
+	$cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
 
 	if ( $d ) {
-		wp_dropdown_categories($cat_args . '&show_option_none= ' . __('Select Category'));
+		$cat_args['show_option_none'] = __('Select Category');
+		wp_dropdown_categories($cat_args);
 ?>
 
 <script type='text/javascript'>
-- 
cgit