Index: /trunk/wp-includes/user.php
===================================================================
--- /trunk/wp-includes/user.php (revision 23578)
+++ /trunk/wp-includes/user.php (revision 23579)
@@ -88,16 +88,16 @@
if ( !$user )
- return new WP_Error('invalid_username', sprintf(__('ERROR: Invalid username. Lost your password?'), wp_lostpassword_url()));
+ return new WP_Error( 'invalid_username', sprintf( __( 'ERROR: Invalid username. Lost your password?' ), wp_lostpassword_url() ) );
if ( is_multisite() ) {
// Is user marked as spam?
- if ( 1 == $user->spam)
- return new WP_Error('invalid_username', __('ERROR: Your account has been marked as a spammer.'));
+ if ( 1 == $user->spam )
+ return new WP_Error( 'spammer_account', __( 'ERROR: Your account has been marked as a spammer.' ) );
// Is a user's blog marked as spam?
- if ( !is_super_admin( $user->ID ) && isset($user->primary_blog) ) {
+ if ( !is_super_admin( $user->ID ) && isset( $user->primary_blog ) ) {
$details = get_blog_details( $user->primary_blog );
if ( is_object( $details ) && $details->spam == 1 )
- return new WP_Error('blog_suspended', __('Site Suspended.'));
+ return new WP_Error( 'blog_suspended', __( 'Site Suspended.' ) );
}
}