From 4bf3397cb9d46241a514cb4393bb959374effaaf Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 15 May 2008 20:07:54 +0000 Subject: [PATCH] Clear out bad activation keys from 2.5.1. fixes #6842 for trunk git-svn-id: http://svn.automattic.com/wordpress/trunk@7936 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 9 +++++++++ wp-includes/version.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index ad5871e13d..0955794851 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(); @@ -733,6 +736,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 diff --git a/wp-includes/version.php b/wp-includes/version.php index 3f0bb037c2..09e0b6b083 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,6 +16,6 @@ $wp_version = '2.6-bleeding'; * * @global int $wp_db_version */ -$wp_db_version = 7842; +$wp_db_version = 7935; ?>