From 6cf0ede185d7f0b52faefa0fbd8413c8aa215fe1 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Mon, 4 Aug 2008 20:34:45 +0000
Subject: [PATCH] Cast to array to avoid warning. Props santosj. fixes #7222
 for trunk

git-svn-id: https://develop.svn.wordpress.org/trunk@8538 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/widgets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 6d1c5d499c..f1fafab43e 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -57,7 +57,7 @@ function register_sidebar($args = array()) {
 		'after_title' => "</h2>\n",
 	);
 
-	$sidebar = array_merge($defaults, $args);
+	$sidebar = array_merge($defaults, (array) $args);
 
 	$wp_registered_sidebars[$sidebar['id']] = $sidebar;