X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..refs/tags/wordpress-4.3.1:/wp-admin/includes/user.php

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 49062fcb..8e1df4f2 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -11,7 +11,7 @@
  *
  * @since 2.0.0
  *
- * @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
+ * @return int|WP_Error WP_Error or User ID.
  */
 function add_user() {
 	return edit_user();
@@ -25,10 +25,10 @@ function add_user() {
  * @since 2.0.0
  *
  * @param int $user_id Optional. User ID.
- * @return int user id of the updated user
+ * @return int|WP_Error user id of the updated user
  */
 function edit_user( $user_id = 0 ) {
-	global $wp_roles;
+	$wp_roles = wp_roles();
 	$user = new stdClass;
 	if ( $user_id ) {
 		$update = true;
@@ -176,7 +176,7 @@ function edit_user( $user_id = 0 ) {
 		$user_id = wp_update_user( $user );
 	} else {
 		$user_id = wp_insert_user( $user );
-		wp_new_user_notification( $user_id, isset( $_POST['send_password'] ) ? wp_unslash( $pass1 ) : '' );
+		wp_new_user_notification( $user_id, null, 'both' );
 	}
 	return $user_id;
 }
@@ -198,9 +198,7 @@ function edit_user( $user_id = 0 ) {
  * @return array
  */
 function get_editable_roles() {
-	global $wp_roles;
-
-	$all_roles = $wp_roles->roles;
+	$all_roles = wp_roles()->roles;
 
 	/**
 	 * Filter the list of editable roles.
@@ -236,6 +234,8 @@ function get_user_to_edit( $user_id ) {
  *
  * @since 2.0.0
  *
+ * @global wpdb $wpdb
+ *
  * @param int $user_id User ID.
  * @return array
  */
@@ -264,6 +264,8 @@ function get_users_drafts( $user_id ) {
  *
  * @since 2.0.0
  *
+ * @global wpdb $wpdb
+ *
  * @param int $id User ID.
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
@@ -384,9 +386,12 @@ function wp_revoke_user($id) {
 	$user->remove_all_caps();
 }
 
-add_action('admin_init', 'default_password_nag_handler');
 /**
  * @since 2.8.0
+ *
+ * @global int $user_ID
+ *
+ * @param false $errors Deprecated.
  */
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
@@ -401,10 +406,11 @@ function default_password_nag_handler($errors = false) {
 	}
 }
 
-add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
-
 /**
  * @since 2.8.0
+ *
+ * @param int    $user_ID
+ * @param object $old_data
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
@@ -420,10 +426,10 @@ function default_password_nag_edit_user($user_ID, $old_data) {
 	}
 }
 
-add_action('admin_notices', 'default_password_nag');
-
 /**
  * @since 2.8.0
+ *
+ * @global string $pagenow
  */
 function default_password_nag() {
 	global $pagenow;
@@ -434,7 +440,7 @@ function default_password_nag() {
 	echo '<div class="error default-password-nag">';
 	echo '<p>';
 	echo '<strong>' . __('Notice:') . '</strong> ';
-	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it to something easier to remember?');
+	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it?');
 	echo '</p><p>';
 	printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password' );
 	printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );