summaryrefslogtreecommitdiffstats
path: root/wp-admin/includes/dashboard.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-24 11:45:39 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-24 11:45:39 +0000
commitcf9f85dc8121a359d550ffa3b735fb48859eee88 (patch)
tree9f90be15fc46163f5656f019f2a2866414b7c9f2 /wp-admin/includes/dashboard.php
parentf10f9f5b05e23ce4c07479b094bd3ff4bbfd86d0 (diff)
Merged with WP 2.5, revision 7806
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes/dashboard.php')
-rw-r--r--wp-admin/includes/dashboard.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 72a6dbc..9ce9db9 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -4,7 +4,8 @@
function wp_dashboard_setup() {
global $wpdb, $wp_dashboard_sidebars;
$update = false;
- if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
+ $widget_options = get_option( 'dashboard_widget_options' );
+ if ( !$widget_options || !is_array($widget_options) )
$widget_options = array();