From 8f91d9a0b9c043fe2c5773196a3363158538cff2 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Tue, 21 Apr 2009 23:12:57 +0000 Subject: [PATCH] Drop the dual-use of db_version. Now it just stores the version. Post-upgrade hook triggered by separate binary db_upgraded option. fixes #9618 git-svn-id: http://svn.automattic.com/wordpress/trunk@11040 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin.php | 4 ++-- wp-admin/includes/upgrade.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 116829374..503e4ed2d 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -18,9 +18,9 @@ if ( defined('ABSPATH') ) else require_once('../wp-load.php'); -if ( get_option('db_version') == 'db_upgraded' ) { +if ( get_option('db_upgraded') ) { $wp_rewrite->flush_rules(); - update_option('db_version', $wp_db_version); + update_option( 'db_upgraded', false ); /** * Runs on the next page load after successful upgrade diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 13a1f6fe8..8b76c7d34 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -344,7 +344,8 @@ function upgrade_all() { maybe_disable_automattic_widgets(); - update_option('db_version', 'db_upgraded'); + update_option( 'db_version', $wp_db_version ); + update_option( 'db_upgraded', true ); } /**