From eb2d6cea067f816cb2b7f44cdcc13c9152f1fa5c Mon Sep 17 00:00:00 2001 From: markjaquith Date: Thu, 6 Sep 2007 23:08:25 +0000 Subject: [PATCH] Upgrade the options table before calling populate_options() to avoid errors. Props Nazgul. fixes #4921 git-svn-id: http://svn.automattic.com/wordpress/trunk@6053 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index caed835506..9fa3b22c26 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -171,6 +171,9 @@ function upgrade_all() { $wp_current_db_version = 2541; } + if ( $wp_current_db_version < 6039 ) + upgrade_230_options_table(); + populate_options(); if ( $wp_current_db_version < 2541 ) { @@ -192,9 +195,6 @@ function upgrade_all() { if ( $wp_current_db_version < 5539 ) upgrade_230(); - if ( $wp_current_db_version < 6039 ) - upgrade_230_options_table(); - maybe_disable_automattic_widgets(); $wp_rewrite->flush_rules();