Changeset 31090 for trunk/src/wp-login.php

Timestamp:

01/08/2015 07:04:40 AM (10 years ago)

Author:

wonderboymusic

Message:

The keyword elseif should be used instead of else if so that all control keywords look like single words.

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

• trunk/src/wp-login.php (modified) (2 diffs)

trunk/src/wp-login.php

@@ -277 +277 @@
     if ( empty( $_POST['user_login'] ) ) {
         $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
-    } else if ( strpos( $_POST['user_login'], '@' ) ) {
+    } elseif ( strpos( $_POST['user_login'], '@' ) ) {
         $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
         if ( empty( $user_data ) )
@@ -334 +334 @@
     $allow = apply_filters( 'allow_password_reset', true, $user_data->ID );
 
-    if ( ! $allow )
-        return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
-    else if ( is_wp_error($allow) )
+    if ( ! $allow ) {
+        return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') );
+    } elseif ( is_wp_error( $allow ) ) {
         return $allow;
+    }
 
     // Generate something random for a password reset key.