Ticket #20332: patch.2.diff
| File patch.2.diff, 3.2 KB (added by dllh, 14 months ago) |
|---|
-
wp-includes/ms-functions.php
445 445 $user_email = sanitize_email( $user_email ); 446 446 447 447 if ( empty( $user_name ) ) 448 $errors->add('user_name', __( 'Please enter a username'));448 $errors->add('user_name', __( 'Please enter a username.' ) ); 449 449 450 450 $illegal_names = get_site_option( 'illegal_names' ); 451 451 if ( is_array( $illegal_names ) == false ) { … … 453 453 add_site_option( 'illegal_names', $illegal_names ); 454 454 } 455 455 if ( in_array( $user_name, $illegal_names ) == true ) 456 $errors->add('user_name', __( 'That username is not allowed'));456 $errors->add('user_name', __( 'That username is not allowed.' ) ); 457 457 458 458 if ( is_email_address_unsafe( $user_email ) ) 459 459 $errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); 460 460 461 461 if ( strlen( $user_name ) < 4 ) 462 $errors->add('user_name', __( 'Username must be at least 4 characters'));462 $errors->add('user_name', __( 'Username must be at least 4 characters.' ) ); 463 463 464 464 if ( strpos( ' ' . $user_name, '_' ) != false ) 465 465 $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character “_”!' ) ); … … 471 471 $errors->add('user_name', __('Sorry, usernames must have letters too!')); 472 472 473 473 if ( !is_email( $user_email ) ) 474 $errors->add('user_email', __( 'Please enter a correct email address'));474 $errors->add('user_email', __( 'Please enter a correct email address.' ) ); 475 475 476 476 $limited_email_domains = get_site_option( 'limited_email_domains' ); 477 477 if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { … … 559 559 $illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) ); 560 560 561 561 if ( empty( $blogname ) ) 562 $errors->add('blogname', __( 'Please enter a site name'));562 $errors->add('blogname', __( 'Please enter a site name.' ) ); 563 563 564 564 if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) 565 $errors->add('blogname', __( 'Only lowercase letters and numbers allowed'));565 $errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) ); 566 566 567 567 if ( in_array( $blogname, $illegal_names ) == true ) 568 $errors->add('blogname', __( 'That name is not allowed'));568 $errors->add('blogname', __( 'That name is not allowed.' ) ); 569 569 570 570 if ( strlen( $blogname ) < 4 && !is_super_admin() ) 571 $errors->add('blogname', __( 'Site name must be at least 4 characters'));571 $errors->add('blogname', __( 'Site name must be at least 4 characters.' ) ); 572 572 573 573 if ( strpos( ' ' . $blogname, '_' ) != false ) 574 574 $errors->add( 'blogname', __( 'Sorry, site names may not contain the character “_”!' ) ); … … 588 588 $blog_title = stripslashes( $blog_title ); 589 589 590 590 if ( empty( $blog_title ) ) 591 $errors->add('blog_title', __( 'Please enter a site title'));591 $errors->add('blog_title', __( 'Please enter a site title.' ) ); 592 592 593 593 // Check if the domain/path has been used already. 594 594 if ( is_subdomain_install() ) {
