/**
* Creates a new user from the "Users" form using $_POST information.
*
- * @since 2.0
+ * @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();
*
* Used on user-edit.php and profile.php to manage and process user options, passwords etc.
*
- * @since 2.0
+ * @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, $wpdb;
+ $wp_roles = wp_roles();
$user = new stdClass;
if ( $user_id ) {
$update = true;
}
if ( isset( $_POST['email'] ))
- $user->user_email = sanitize_text_field( $_POST['email'] );
+ $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
if ( isset( $_POST['url'] ) ) {
if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
$user->user_url = '';
$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, 'both' );
}
return $user_id;
}
* only editors or authors. This filter allows admins to delegate
* user management.
*
- * @since 2.8
+ * @since 2.8.0
*
- * @return unknown
+ * @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.
*
* @since 2.0.0
*
+ * @global wpdb $wpdb
+ *
* @param int $user_id User ID.
* @return array
*/
/**
* Remove user and optionally reassign posts and links to another user.
*
- * If the $reassign parameter is not assigned to an User ID, then all posts will
+ * If the $reassign parameter is not assigned to a User ID, then all posts will
* be deleted of that user. The action 'delete_user' that is passed the User ID
* being deleted will be run after the posts are either reassigned or deleted.
* The user meta will also be deleted that are for that 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.
*/
-function wp_delete_user( $id, $reassign = 'novalue' ) {
+function wp_delete_user( $id, $reassign = null ) {
global $wpdb;
$id = (int) $id;
if ( !$user->exists() )
return false;
+ // Normalize $reassign to null or a user ID. 'novalue' was an older default.
+ if ( 'novalue' === $reassign ) {
+ $reassign = null;
+ } elseif ( null !== $reassign ) {
+ $reassign = (int) $reassign;
+ }
+
/**
* Fires immediately before a user is deleted from the database.
*
* @since 2.0.0
*
- * @param int $id User ID.
+ * @param int $id ID of the user to delete.
+ * @param int|null $reassign ID of the user to reassign posts and links to.
+ * Default null, for no reassignment.
*/
- do_action( 'delete_user', $id );
+ do_action( 'delete_user', $id, $reassign );
- if ( 'novalue' === $reassign || null === $reassign ) {
+ if ( null === $reassign ) {
$post_types_to_delete = array();
foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
if ( $post_type->delete_with_user ) {
wp_delete_link($link_id);
}
} else {
- $reassign = (int) $reassign;
$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
if ( ! empty( $post_ids ) ) {
*
* @since 2.9.0
*
- * @param int $id ID of the deleted user.
+ * @param int $id ID of the deleted user.
+ * @param int|null $reassign ID of the user to reassign posts and links to.
+ * Default null, for no reassignment.
*/
- do_action( 'deleted_user', $id );
+ do_action( 'deleted_user', $id, $reassign );
return true;
}
$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;
- if ( ! get_user_option('default_password_nag') ) //Short circuit it.
+ // Short-circuit it.
+ if ( ! get_user_option('default_password_nag') )
return;
- //get_user_setting = JS saved UI setting. else no-js-fallback code.
+ // get_user_setting = JS saved UI setting. else no-js-fallback code.
if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
delete_user_setting('default_password_nag');
update_user_option($user_ID, 'default_password_nag', false, true);
}
}
-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) {
- if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
+ // Short-circuit it.
+ if ( ! get_user_option('default_password_nag', $user_ID) )
return;
$new_data = get_userdata($user_ID);
- if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
+ // Remove the nag if the password has been changed.
+ if ( $new_data->user_pass != $old_data->user_pass ) {
delete_user_setting('default_password_nag');
update_user_option($user_ID, 'default_password_nag', false, true);
}
}
-add_action('admin_notices', 'default_password_nag');
/**
* @since 2.8.0
+ *
+ * @global string $pagenow
*/
function default_password_nag() {
global $pagenow;
- if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
+ // Short-circuit it.
+ if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
return;
echo '<div class="error default-password-nag">';
echo '<p>';
echo '<strong>' . __('Notice:') . '</strong> ';
- _e('You’re using the auto-generated password for your account. Would you like to change it to something easier to remember?');
+ _e('You’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( get_current_user_id() ) . '#password' );
+ 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' );
echo '</p></div>';
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff