From 831a69f318dc8871cb46f03819e8d88a5fe6adbe Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 5 Jan 2009 23:03:17 +0000 Subject: [PATCH] Default to empty array if sidebars_widgets is not set. Don't unset array_version if not set. fixes #8804 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@10314 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/widgets.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 0224da70b..2d6540183 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -548,7 +548,7 @@ function is_dynamic_sidebar() { function wp_get_sidebars_widgets($update = true) { global $wp_registered_widgets, $wp_registered_sidebars; - $sidebars_widgets = get_option('sidebars_widgets'); + $sidebars_widgets = get_option('sidebars_widgets', array()); $_sidebars_widgets = array(); if ( !isset($sidebars_widgets['array_version']) ) @@ -618,7 +618,8 @@ function wp_get_sidebars_widgets($update = true) { update_option('sidebars_widgets', $sidebars_widgets); } - unset($sidebars_widgets['array_version']); + if ( isset($sidebars_widgets['array_version']) ) + unset($sidebars_widgets['array_version']); $sidebars_widgets = apply_filters('sidebars_widgets', $sidebars_widgets); return $sidebars_widgets;