--- a/web/wp-admin/includes/user.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/includes/user.php Mon Nov 19 18:26:13 2012 +0100
@@ -9,38 +9,12 @@
/**
* Creates a new user from the "Users" form using $_POST information.
*
- * It seems that the first half is for backwards compatibility, but only
- * has the ability to alter the user's role. WordPress core seems to
- * use this function only in the second way, running edit_user() with
- * no id so as to create a new user.
- *
* @since 2.0
*
- * @param int $user_id Optional. User ID.
* @return null|WP_Error|int Null when adding user, WP_Error or User ID integer when no parameters.
*/
function add_user() {
- if ( func_num_args() ) { // The hackiest hack that ever did hack
- global $current_user, $wp_roles;
- $user_id = (int) func_get_arg( 0 );
-
- if ( isset( $_POST['role'] ) ) {
- $new_role = sanitize_text_field( $_POST['role'] );
- // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
- if ( $user_id != $current_user->id || $wp_roles->role_objects[$new_role]->has_cap( 'edit_users' ) ) {
- // If the new role isn't editable by the logged-in user die with error
- $editable_roles = get_editable_roles();
- if ( !$editable_roles[$new_role] )
- wp_die(__('You can’t give users that role.'));
-
- $user = new WP_User( $user_id );
- $user->set_role( $new_role );
- }
- }
- } else {
- add_action( 'user_register', 'add_user' ); // See above
- return edit_user();
- }
+ return edit_user();
}
/**
@@ -54,15 +28,15 @@
* @return int user id of the updated user
*/
function edit_user( $user_id = 0 ) {
- global $current_user, $wp_roles, $wpdb;
- if ( $user_id != 0 ) {
+ global $wp_roles, $wpdb;
+ $user = new stdClass;
+ if ( $user_id ) {
$update = true;
$user->ID = (int) $user_id;
$userdata = get_userdata( $user_id );
$user->user_login = $wpdb->escape( $userdata->user_login );
} else {
$update = false;
- $user = '';
}
if ( !$update && isset( $_POST['user_login'] ) )
@@ -76,13 +50,15 @@
if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
$new_role = sanitize_text_field( $_POST['role'] );
+ $potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
- if( $user_id != $current_user->id || $wp_roles->role_objects[$new_role]->has_cap( 'edit_users' ))
+ // Multisite super admins can freely edit their blog roles -- they possess all caps.
+ if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
$user->role = $new_role;
// If the new role isn't editable by the logged-in user die with error
$editable_roles = get_editable_roles();
- if ( !$editable_roles[$new_role] )
+ if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
wp_die(__('You can’t give users that role.'));
}
@@ -92,7 +68,7 @@
if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
$user->user_url = '';
} else {
- $user->user_url = sanitize_url( $_POST['url'] );
+ $user->user_url = esc_url_raw( $_POST['url'] );
$user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
}
}
@@ -108,7 +84,7 @@
if ( isset( $_POST['description'] ) )
$user->description = trim( $_POST['description'] );
- foreach ( _wp_get_user_contactmethods() as $method => $name ) {
+ foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
if ( isset( $_POST[$method] ))
$user->$method = sanitize_text_field( $_POST[$method] );
}
@@ -116,6 +92,7 @@
if ( $update ) {
$user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
$user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
+ $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
}
$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
@@ -156,8 +133,8 @@
if ( !empty( $pass1 ) )
$user->user_pass = $pass1;
- if ( !$update && !validate_username( $user->user_login ) )
- $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid. Please enter a valid username.' ));
+ if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
+ $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
if ( !$update && username_exists( $user->user_login ) )
$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
@@ -167,7 +144,7 @@
$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
} elseif ( !is_email( $user->user_email ) ) {
$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn’t correct.' ), array( 'form-field' => 'email' ) );
- } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) {
+ } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
$errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
}
@@ -187,84 +164,12 @@
}
/**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- *
- * @return array List of user IDs.
- */
-function get_author_user_ids() {
- global $wpdb;
- $level_key = $wpdb->prefix . 'user_level';
- return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- *
- * @param int $user_id User ID.
- * @return array|bool List of editable authors. False if no editable users.
- */
-function get_editable_authors( $user_id ) {
- global $wpdb;
-
- $editable = get_editable_user_ids( $user_id );
-
- if( !$editable ) {
- return false;
- } else {
- $editable = join(',', $editable);
- $authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
- }
-
- return apply_filters('get_editable_authors', $authors);
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- *
- * @param int $user_id User ID.
- * @param bool $exclude_zeros Optional, default is true. Whether to exclude zeros.
- * @return unknown
- */
-function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
- global $wpdb;
-
- $user = new WP_User( $user_id );
-
- if ( ! $user->has_cap("edit_others_{$post_type}s") ) {
- if ( $user->has_cap("edit_{$post_type}s") || $exclude_zeros == false )
- return array($user->id);
- else
- return array();
- }
-
- $level_key = $wpdb->prefix . 'user_level';
-
- $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
- if ( $exclude_zeros )
- $query .= " AND meta_value != '0'";
-
- return $wpdb->get_col( $query );
-}
-
-/**
* Fetch a filtered list of user roles that the current user is
* allowed to edit.
*
* Simple function who's main purpose is to allow filtering of the
* list of roles in the $wp_roles object so that plugins can remove
- * innappropriate ones depending on the situation or user making edits.
+ * inappropriate ones depending on the situation or user making edits.
* Specifically because without filtering anyone with the edit_users
* capability can edit others to be administrators, even if they are
* only editors or authors. This filter allows admins to delegate
@@ -284,80 +189,9 @@
}
/**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- *
- * @return unknown
- */
-function get_nonauthor_user_ids() {
- global $wpdb;
- $level_key = $wpdb->prefix . 'user_level';
-
- return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
-}
-
-/**
- * Retrieve editable posts from other users.
- *
- * @since unknown
- *
- * @param int $user_id User ID to not retrieve posts from.
- * @param string $type Optional, defaults to 'any'. Post type to retrieve, can be 'draft' or 'pending'.
- * @return array List of posts from others.
- */
-function get_others_unpublished_posts($user_id, $type='any') {
- global $wpdb;
-
- $editable = get_editable_user_ids( $user_id );
-
- if ( in_array($type, array('draft', 'pending')) )
- $type_sql = " post_status = '$type' ";
- else
- $type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
-
- $dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
-
- if( !$editable ) {
- $other_unpubs = '';
- } else {
- $editable = join(',', $editable);
- $other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
- }
-
- return apply_filters('get_others_drafts', $other_unpubs);
-}
-
-/**
- * Retrieve drafts from other users.
- *
- * @since unknown
- *
- * @param int $user_id User ID.
- * @return array List of drafts from other users.
- */
-function get_others_drafts($user_id) {
- return get_others_unpublished_posts($user_id, 'draft');
-}
-
-/**
- * Retrieve pending review posts from other users.
- *
- * @since unknown
- *
- * @param int $user_id User ID.
- * @return array List of posts with pending review post type from other users.
- */
-function get_others_pending($user_id) {
- return get_others_unpublished_posts($user_id, 'pending');
-}
-
-/**
* Retrieve user data and filter it.
*
- * @since unknown
+ * @since 2.0.5
*
* @param int $user_id User ID.
* @return object WP_User object with user data.
@@ -365,16 +199,7 @@
function get_user_to_edit( $user_id ) {
$user = new WP_User( $user_id );
- $user_contactmethods = _wp_get_user_contactmethods();
- foreach ($user_contactmethods as $method => $name) {
- if ( empty( $user->{$method} ) )
- $user->{$method} = '';
- }
-
- if ( empty($user->description) )
- $user->description = '';
-
- $user = sanitize_user_object($user, 'edit');
+ $user->filter = 'edit';
return $user;
}
@@ -382,7 +207,7 @@
/**
* Retrieve the user's drafts.
*
- * @since unknown
+ * @since 2.0.0
*
* @param int $user_id User ID.
* @return array
@@ -402,27 +227,37 @@
* 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 unknown
+ * @since 2.0.0
*
* @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 = 'novalue' ) {
global $wpdb;
$id = (int) $id;
- $user = new WP_User($id);
+ $user = new WP_User( $id );
// allow for transaction statement
do_action('delete_user', $id);
- if ($reassign == 'novalue') {
- $post_ids = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id) );
+ if ( 'novalue' === $reassign || null === $reassign ) {
+ $post_types_to_delete = array();
+ foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
+ if ( $post_type->delete_with_user ) {
+ $post_types_to_delete[] = $post_type->name;
+ } elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+ $post_types_to_delete[] = $post_type->name;
+ }
+ }
- if ($post_ids) {
- foreach ($post_ids as $post_id)
- wp_delete_post($post_id);
+ $post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
+ $post_types_to_delete = implode( "', '", $post_types_to_delete );
+ $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
+ if ( $post_ids ) {
+ foreach ( $post_ids as $post_id )
+ wp_delete_post( $post_id );
}
// Clean links
@@ -432,22 +267,24 @@
foreach ( $link_ids as $link_id )
wp_delete_link($link_id);
}
-
} else {
$reassign = (int) $reassign;
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $id) );
- $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $id) );
+ $wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
+ $wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
}
// FINALLY, delete user
-
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) );
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) );
+ if ( is_multisite() ) {
+ remove_user_from_blog( $id, get_current_blog_id() );
+ } else {
+ $meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
+ foreach ( $meta as $mid )
+ delete_metadata_by_mid( 'user', $mid );
- wp_cache_delete($id, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
- wp_cache_delete($user->user_email, 'useremail');
- wp_cache_delete($user->user_nicename, 'userslugs');
+ $wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+ }
+
+ clean_user_cache( $user );
// allow for commit transaction
do_action('deleted_user', $id);
@@ -458,7 +295,7 @@
/**
* Remove all capabilities from user.
*
- * @since unknown
+ * @since 2.1.0
*
* @param int $id User ID.
*/
@@ -469,363 +306,53 @@
$user->remove_all_caps();
}
-if ( !class_exists('WP_User_Search') ) :
+add_action('admin_init', 'default_password_nag_handler');
/**
- * WordPress User Search class.
- *
- * @since unknown
- * @author Mark Jaquith
+ * @since 2.8.0
*/
-class WP_User_Search {
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $results;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $search_term;
-
- /**
- * Page number.
- *
- * @since unknown
- * @access private
- * @var int
- */
- var $page;
-
- /**
- * Role name that users have.
- *
- * @since unknown
- * @access private
- * @var string
- */
- var $role;
-
- /**
- * Raw page number.
- *
- * @since unknown
- * @access private
- * @var int|bool
- */
- var $raw_page;
-
- /**
- * Amount of users to display per page.
- *
- * @since unknown
- * @access public
- * @var int
- */
- var $users_per_page = 50;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $first_user;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var int
- */
- var $last_user;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $query_limit;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $query_sort;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $query_from_where;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var int
- */
- var $total_users_for_query = 0;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var bool
- */
- var $too_many_total_users = false;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $search_errors;
-
- /**
- * {@internal Missing Description}}
- *
- * @since unknown
- * @access private
- * @var unknown_type
- */
- var $paging_text;
-
- /**
- * PHP4 Constructor - Sets up the object properties.
- *
- * @since unknown
- *
- * @param string $search_term Search terms string.
- * @param int $page Optional. Page ID.
- * @param string $role Role name.
- * @return WP_User_Search
- */
- function WP_User_Search ($search_term = '', $page = '', $role = '') {
- $this->search_term = $search_term;
- $this->raw_page = ( '' == $page ) ? false : (int) $page;
- $this->page = (int) ( '' == $page ) ? 1 : $page;
- $this->role = $role;
-
- $this->prepare_query();
- $this->query();
- $this->prepare_vars_for_template_usage();
- $this->do_paging();
- }
-
- /**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- * @access public
- */
- function prepare_query() {
- global $wpdb;
- $this->first_user = ($this->page - 1) * $this->users_per_page;
- $this->query_limit = $wpdb->prepare(" LIMIT %d, %d", $this->first_user, $this->users_per_page);
- $this->query_sort = ' ORDER BY user_login';
- $search_sql = '';
- if ( $this->search_term ) {
- $searches = array();
- $search_sql = 'AND (';
- foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
- $searches[] = $col . " LIKE '%$this->search_term%'";
- $search_sql .= implode(' OR ', $searches);
- $search_sql .= ')';
- }
-
- $this->query_from_where = "FROM $wpdb->users";
- if ( $this->role )
- $this->query_from_where .= $wpdb->prepare(" INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id WHERE $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
- else
- $this->query_from_where .= " WHERE 1=1";
- $this->query_from_where .= " $search_sql";
-
- }
-
- /**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- * @access public
- */
- function query() {
- global $wpdb;
- $this->results = $wpdb->get_col('SELECT ID ' . $this->query_from_where . $this->query_sort . $this->query_limit);
-
- if ( $this->results )
- $this->total_users_for_query = $wpdb->get_var('SELECT COUNT(ID) ' . $this->query_from_where); // no limit
- else
- $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
- }
-
- /**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- * @access public
- */
- function prepare_vars_for_template_usage() {
- $this->search_term = stripslashes($this->search_term); // done with DB, from now on we want slashes gone
- }
-
- /**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- * @access public
- */
- function do_paging() {
- if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
- $args = array();
- if( ! empty($this->search_term) )
- $args['usersearch'] = urlencode($this->search_term);
- if( ! empty($this->role) )
- $args['role'] = urlencode($this->role);
-
- $this->paging_text = paginate_links( array(
- 'total' => ceil($this->total_users_for_query / $this->users_per_page),
- 'current' => $this->page,
- 'base' => 'users.php?%_%',
- 'format' => 'userspage=%#%',
- 'add_args' => $args
- ) );
- if ( $this->paging_text ) {
- $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s–%s of %s' ) . '</span>%s',
- number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
- number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
- number_format_i18n( $this->total_users_for_query ),
- $this->paging_text
- );
- }
- }
- }
-
- /**
- * {@internal Missing Short Description}}
- *
- * {@internal Missing Long Description}}
- *
- * @since unknown
- * @access public
- *
- * @return unknown
- */
- function get_results() {
- return (array) $this->results;
- }
-
- /**
- * Displaying paging text.
- *
- * @see do_paging() Builds paging text.
- *
- * @since unknown
- * @access public
- */
- function page_links() {
- echo $this->paging_text;
- }
-
- /**
- * Whether paging is enabled.
- *
- * @see do_paging() Builds paging text.
- *
- * @since unknown
- * @access public
- *
- * @return bool
- */
- function results_are_paged() {
- if ( $this->paging_text )
- return true;
- return false;
- }
-
- /**
- * Whether there are search terms.
- *
- * @since unknown
- * @access public
- *
- * @return bool
- */
- function is_search() {
- if ( $this->search_term )
- return true;
- return false;
- }
-}
-endif;
-
-add_action('admin_init', 'default_password_nag_handler');
function default_password_nag_handler($errors = false) {
global $user_ID;
- if ( ! get_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+ if ( ! get_user_option('default_password_nag') ) //Short circuit it.
return;
- //get_user_setting = JS saved UI setting. else no-js-falback 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_usermeta($user_ID, 'default_password_nag', false);
+ 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
+ */
function default_password_nag_edit_user($user_ID, $old_data) {
- global $user_ID;
- if ( ! get_usermeta($user_ID, 'default_password_nag') ) //Short circuit it.
+ if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
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.
- delete_user_setting('default_password_nag');
- update_usermeta($user_ID, 'default_password_nag', false);
+ delete_user_setting('default_password_nag', $user_ID);
+ update_user_option($user_ID, 'default_password_nag', false, true);
}
}
add_action('admin_notices', 'default_password_nag');
+/**
+ * @since 2.8.0
+ */
function default_password_nag() {
- global $user_ID;
- if ( ! get_usermeta($user_ID, 'default_password_nag') )
+ global $pagenow;
+ if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
return;
- echo '<div class="error default-password-nag"><p>';
- printf(__("Notice: you're using the auto-generated password for your account. Would you like to change it to something you'll remember easier?<br />
- <a href='%s'>Yes, Take me to my profile page</a> | <a href='%s' id='default-password-nag-no'>No Thanks, Do not remind me again.</a>"), admin_url('profile.php') . '#password', '?default_password_nag=0');
+ 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?');
+ echo '</p><p>';
+ printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', admin_url('profile.php') . '#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>';
}
-
-?>