Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade the options table before calling populate_options() to avoid errors. Props Nazgul. fixes #4921

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@6053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-09-06 23:08:25 +00:00
parent 445d7b077f
commit eb2d6cea06
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/upgrade.php
View File

@ -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();