WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
ryan 2009-01-05 23:03:17 +00:00
parent 578c4e7b61
commit 831a69f318
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/widgets.php
View File

@ -548,7 +548,7 @@ function is_dynamic_sidebar() {
function wp_get_sidebars_widgets($update = true) { function wp_get_sidebars_widgets($update = true) {
global $wp_registered_widgets, $wp_registered_sidebars; global $wp_registered_widgets, $wp_registered_sidebars;
$sidebars_widgets = get_option('sidebars_widgets'); $sidebars_widgets = get_option('sidebars_widgets', array());
$_sidebars_widgets = array(); $_sidebars_widgets = array();
if ( !isset($sidebars_widgets['array_version']) ) if ( !isset($sidebars_widgets['array_version']) )
@ -618,7 +618,8 @@ function wp_get_sidebars_widgets($update = true) {
update_option('sidebars_widgets', $sidebars_widgets); 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); $sidebars_widgets = apply_filters('sidebars_widgets', $sidebars_widgets);
return $sidebars_widgets; return $sidebars_widgets;