Changeset 12624

Timestamp:

01/07/2010 02:22:51 AM (13 years ago)

Author:

ryan

Message:

Deprecate generate_random_password(). fixes #11746

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (added)
• wp-includes/ms-functions.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/ms-edit.php

@@ -158 +158 @@
         $user_id = email_exists($email);
         if( !$user_id ) { // Create a new user with a random password
-            $password = generate_random_password();
+            $password = wp_generate_password();
             $user_id = wpmu_create_user( $domain, $password, $email );
             if(false == $user_id) {

trunk/wp-includes/ms-functions.php

@@ -1215 +1215 @@
     $user_email = $wpdb->escape($signup->user_email);
     wpmu_validate_user_signup($user_login, $user_email);
-    $password = generate_random_password();
+    $password = wp_generate_password();
 
     $user_id = username_exists($user_login);
@@ -1267 +1267 @@
 
     return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
-}
-
-function generate_random_password( $len = 8 ) {
-    $random_password = substr(md5(uniqid(microtime())), 0, intval( $len ) );
-    $random_password = apply_filters('random_password', $random_password);
-    return $random_password;
 }
 

trunk/wp-settings.php

@@ -406 +406 @@
     require_once( ABSPATH . WPINC . '/ms-functions.php' );
     require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
+    require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
 }