Changeset 44930 for trunk/src/wp-includes/user.php

Timestamp:

03/19/2019 02:36:18 AM (8 years ago)

Author:

desrosj

Message:

General: Ensure error messages end with a period for consistency.

Props garrett-eclipse, birgire.
See #44901.

File:

• trunk/src/wp-includes/user.php (modified) (7 diffs)

trunk/src/wp-includes/user.php

@@ -2311 +2311 @@
 
         if ( empty( $key ) || ! is_string( $key ) ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }
 
         if ( empty( $login ) || ! is_string( $login ) ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }
 
         $row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
         if ( ! $row ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }
 
@@ -2346 +2346 @@
 
         if ( ! $pass_key ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }
 
@@ -2355 +2355 @@
         } elseif ( $hash_is_correct && $expiration_time ) {
                 // Key has an expiration time that's passed
-                return new WP_Error( 'expired_key', __( 'Invalid key' ) );
+                return new WP_Error( 'expired_key', __( 'Invalid key.' ) );
         }
 
         if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
-                $return  = new WP_Error( 'expired_key', __( 'Invalid key' ) );
+                $return  = new WP_Error( 'expired_key', __( 'Invalid key.' ) );
                 $user_id = $row->ID;
 
@@ -2376 +2376 @@
         }
 
-        return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+        return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
 }
 
@@ -3575 +3575 @@
 
         if ( empty( $key ) ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'missing_key', __( 'Missing confirm key.' ) );
         }
 
@@ -3587 +3587 @@
 
         if ( ! $saved_key ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }
 
         if ( ! $key_request_time ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid action' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid action.' ) );
         }
 
@@ -3605 +3605 @@
 
         if ( ! $wp_hasher->CheckPassword( $key, $saved_key ) ) {
-                return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+                return new WP_Error( 'invalid_key', __( 'Invalid key.' ) );
         }