diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 101b9ab7c6..a0444397b3 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -107,12 +107,12 @@ function edit_user( $user_id = 0 ) { /* checking that username has been typed */ if ( $user->user_login == '' ) $errors->add( 'user_login', __( 'ERROR: Please enter a username.' ) ); - + /* checking that nickname has been typed */ - if ( $update && empty( $user->nickname ) ) { - $errors->add( 'nickname', __( 'ERROR: Please enter a nickname.' ) ); + if ( $update && empty( $user->nickname ) ) { + $errors->add( 'nickname', __( 'ERROR: Please enter a nickname.' ) ); } - + /* checking the password has been typed twice */ /** * Fires before the password and confirm password fields are checked for congruity. @@ -515,4 +515,4 @@ this email. This invitation will expire in a few days. Please click the following link to activate your user account: %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) ); -} \ No newline at end of file +} diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php index ad8f9c2fa3..7499b97c57 100644 --- a/wp-includes/comment-functions.php +++ b/wp-includes/comment-functions.php @@ -708,7 +708,7 @@ function check_comment_flood_db( $ip, $email, $date ) { "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( $check_column = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $user, - $email + $email ); $lasttime = $wpdb->get_var( $sql ); if ( $lasttime ) { diff --git a/wp-includes/taxonomy-functions.php b/wp-includes/taxonomy-functions.php index e53503c3db..59fc9a0bf1 100644 --- a/wp-includes/taxonomy-functions.php +++ b/wp-includes/taxonomy-functions.php @@ -321,7 +321,7 @@ function is_taxonomy_hierarchical($taxonomy) { * @type bool|array $rewrite { * Triggers the handling of rewrites for this taxonomy. Default true, using $taxonomy as slug. To prevent * rewrite, set to false. To specify rewrite rules, an array can be passed with any of these keys: - * + * * @type string $slug Customize the permastruct slug. Default `$taxonomy` key. * @type bool $with_front Should the permastruct be prepended with WP_Rewrite::$front. Default true. * @type bool $hierarchical Either hierarchical rewrite tag or not. Default false. diff --git a/wp-includes/version.php b/wp-includes/version.php index b800ea861c..e321697d3e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34533'; +$wp_version = '4.4-alpha-34534'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.