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
This commit is contained in:
parent
0553790ede
commit
4bf3397cb9
|
@ -205,6 +205,9 @@ function upgrade_all() {
|
||||||
if ( $wp_current_db_version < 7796 )
|
if ( $wp_current_db_version < 7796 )
|
||||||
upgrade_251();
|
upgrade_251();
|
||||||
|
|
||||||
|
if ( $wp_current_db_version < 7935 )
|
||||||
|
upgrade_252();
|
||||||
|
|
||||||
maybe_disable_automattic_widgets();
|
maybe_disable_automattic_widgets();
|
||||||
|
|
||||||
$wp_rewrite->flush_rules();
|
$wp_rewrite->flush_rules();
|
||||||
|
@ -733,6 +736,12 @@ function upgrade_251() {
|
||||||
update_option('secret', wp_generate_password(64));
|
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
|
// The functions we use to actually do stuff
|
||||||
|
|
||||||
// General
|
// General
|
||||||
|
|
|
@ -16,6 +16,6 @@ $wp_version = '2.6-bleeding';
|
||||||
*
|
*
|
||||||
* @global int $wp_db_version
|
* @global int $wp_db_version
|
||||||
*/
|
*/
|
||||||
$wp_db_version = 7842;
|
$wp_db_version = 7935;
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue