Ticket #11746: 11746.diff

wp-includes/ms-deprecated.php

@@ +1 @@
+<?php
+
+function generate_random_password( $len = 8 ) {
+        _deprecated_function( __FUNCTION__, '3.0', 'wp_generarte_password()' );
+        $random_password = substr(md5(uniqid(microtime())), 0, intval( $len ) );
+        $random_password = apply_filters('random_password', $random_password);
+        return $random_password;
+}
+
+?>
+ No newline at end of file

wp-includes/ms-functions.php

@@ -1214 +1214 @@
         $user_login = $wpdb->escape($signup->user_login);
         $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);
 
@@ -1268 +1268 @@
         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;
-}
-
 function wpmu_create_user( $user_name, $password, $email) {
         $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
         if ( username_exists($user_name) )

wp-settings.php

@@ -405 +405 @@
 if ( is_multisite() ) {
         require_once( ABSPATH . WPINC . '/ms-functions.php' );
         require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
+        require_once( ABSPATH . WPINC . '/ms-deprecated.php' );
 }
 
 if ( !defined('WP_CONTENT_URL') )

wp-admin/ms-edit.php

@@ -157 +157 @@
                 $password = 'N/A';
                 $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) {
                                 wp_die( __('There was an error creating the user') );