From 310940b824eff4a116dcd72ccd339bb602021981 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 10 Jun 2008 14:08:54 +0000
Subject: Merge with branches/2.5 in WordPress, revision 8066

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/includes/upgrade.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'wp-admin/includes/upgrade.php')

diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 94bdbd3..800a86d 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -205,6 +205,9 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 7796 )
 		upgrade_251();
 
+	if ( $wp_current_db_version < 7935 )
+		upgrade_252();
+
 	maybe_disable_automattic_widgets();
 
 	$wp_rewrite->flush_rules();
@@ -747,6 +750,12 @@ function upgrade_251() {
 	update_option('secret', wp_generate_password(64));
 }
 
+function upgrade_252() {
+	global $wpdb;
+
+	$wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
+}
+
 // The functions we use to actually do stuff
 
 // General
-- 
cgit