Add hook "after_db_upgrade" and flush rewrite rules on the next page load after successful upgrade

azaozz · azaozz · commit 8ecc21e2dae2 · 2009-02-09T19:19:38.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@10530 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
@@ -18,7 +18,17 @@
 else
 	require_once('../wp-load.php');
 
-if ( get_option('db_version') != $wp_db_version ) {
+if ( get_option('db_version') == 'db_upgraded' ) {
+	$wp_rewrite->flush_rules();
+	update_option('db_version', $wp_db_version);
+
+	/**
+	 * Runs on the next page load after successful upgrade
+	 *
+	 * @since 2.8
+	 */
+	do_action('after_db_upgrade');
+} elseif ( get_option('db_version') != $wp_db_version ) {
 	wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
 	exit;
 }
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
@@ -278,9 +278,7 @@ function upgrade_all() {
 
 	maybe_disable_automattic_widgets();
 
-	$wp_rewrite->flush_rules();
-
-	update_option('db_version', $wp_db_version);
+	update_option('db_version', 'db_upgraded');
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,7 @@ function upgrade_all() {`
`278`	`278`
`279`	`279`	`maybe_disable_automattic_widgets();`
`280`	`280`
`281`		`- $wp_rewrite->flush_rules();`
`282`		`-`
`283`		`- update_option('db_version', $wp_db_version);`
	`281`	`+ update_option('db_version', 'db_upgraded');`
`284`	`282`	`}`
`285`	`283`
`286`	`284`	`/**`