Changeset 1273

Show
Ignore:
Timestamp:
05/07/08 17:24:37 (2 months ago)
Author:
donncha
Message:

Ignore activation key in db.
Generate a correct key, thanks mtdewvirus

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/pluggable.php

    r1266 r1273  
    11761176 * @return string The random password 
    11771177 **/ 
    1178 function wp_generate_password($length = 12) { 
    1179         $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()"; 
     1178function wp_generate_password($length = 12, $special_chars = true) { 
     1179        $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; 
     1180        if ( $special_chars ) 
     1181                $chars .= '!@#$%^&*()'; 
     1182 
    11801183        $password = ''; 
    11811184        for ( $i = 0; $i < $length; $i++ ) 

  • trunk/wp-login.php

    r1260 r1273  
    9191        do_action('retrieve_password', $user_login); 
    9292 
    93         $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); 
    94         if ( empty($key) ) { 
     93        //$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); 
     94        //if ( empty($key) ) { 
    9595                // Generate something random for a key... 
    96                 $key = wp_generate_password(); 
     96                $key = wp_generate_password(20, false); 
    9797                do_action('retrieve_password_key', $user_login, $key); 
    9898                // Now insert the new md5 key into the db 
    9999                $wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET user_activation_key = %s WHERE user_login = %s", $key, $user_login)); 
    100         } 
     100        //} 
    101101        $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; 
    102102        $message .= get_option('siteurl') . "\r\n\r\n";