git-svn-id: http://svn.automattic.com/wordpress/trunk@18812 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e296e48b3d
commit
ccf47d55c4
|
@ -119,7 +119,6 @@ function edit_user( $user_id = 0 ) {
|
||||||
$user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
|
$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->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->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
|
||||||
$user->show_admin_bar_admin = isset( $_POST['admin_bar_admin'] ) ? 'true' : 'false';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
|
$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
|
||||||
|
|
|
@ -1330,9 +1330,6 @@ function wp_insert_user($userdata) {
|
||||||
if ( empty($show_admin_bar_front) )
|
if ( empty($show_admin_bar_front) )
|
||||||
$show_admin_bar_front = 'true';
|
$show_admin_bar_front = 'true';
|
||||||
|
|
||||||
if ( empty($show_admin_bar_admin) )
|
|
||||||
$show_admin_bar_admin = 'true';
|
|
||||||
|
|
||||||
$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
|
$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
|
||||||
|
|
||||||
if ( $user_nicename_check ) {
|
if ( $user_nicename_check ) {
|
||||||
|
@ -1365,7 +1362,6 @@ function wp_insert_user($userdata) {
|
||||||
update_user_meta( $user_id, 'admin_color', $admin_color );
|
update_user_meta( $user_id, 'admin_color', $admin_color );
|
||||||
update_user_meta( $user_id, 'use_ssl', $use_ssl );
|
update_user_meta( $user_id, 'use_ssl', $use_ssl );
|
||||||
update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front );
|
update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front );
|
||||||
update_user_meta( $user_id, 'show_admin_bar_admin', $show_admin_bar_admin );
|
|
||||||
|
|
||||||
$user = new WP_User($user_id);
|
$user = new WP_User($user_id);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue