sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pinking shears.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@34534 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-09-25 04:43:57 +00:00
parent 4da03f3cfc
commit 0c5bd75262
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-admin/includes/user.php
View File

@ -107,12 +107,12 @@ function edit_user( $user_id = 0 ) {
/* checking that username has been typed */ /* checking that username has been typed */
if ( $user->user_login == '' ) if ( $user->user_login == '' )
$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) ); $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
/* checking that nickname has been typed */ /* checking that nickname has been typed */
if ( $update && empty( $user->nickname ) ) { if ( $update && empty( $user->nickname ) ) {
$errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) ); $errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
} }
/* checking the password has been typed twice */ /* checking the password has been typed twice */
/** /**
* Fires before the password and confirm password fields are checked for congruity. * 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: Please click the following link to activate your user account:
%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) ); %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
} }

2
src/wp-includes/comment-functions.php
View File

@ -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", "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, $hour_ago,
$user, $user,
$email $email
); );
$lasttime = $wpdb->get_var( $sql ); $lasttime = $wpdb->get_var( $sql );
if ( $lasttime ) { if ( $lasttime ) {

2
src/wp-includes/taxonomy-functions.php
View File

@ -321,7 +321,7 @@ function is_taxonomy_hierarchical($taxonomy) {
* @type bool|array $rewrite { * @type bool|array $rewrite {
* Triggers the handling of rewrites for this taxonomy. Default true, using $taxonomy as slug. To prevent * 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: * 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 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 $with_front Should the permastruct be prepended with WP_Rewrite::$front. Default true.
* @type bool $hierarchical Either hierarchical rewrite tag or not. Default false. * @type bool $hierarchical Either hierarchical rewrite tag or not. Default false.