Changeset 14124 for trunk/src/bp-settings/actions/general.php

Timestamp:

04/19/2025 01:12:19 PM (17 months ago)

Author:

espellcaste

Message:

WPCS - miscellaneous fixes for the BP Settings component.

See #9174
See #9173

File:

• trunk/src/bp-settings/actions/general.php (modified) (4 diffs)

trunk/src/bp-settings/actions/general.php

@@ -156 +156 @@
                                 if ( ! $pass_error->get_error_message() ) {
                                         // Password change attempt is successful.
-                                        if ( ( ! empty( $_POST['pwd'] ) && wp_unslash( $_POST['pwd'] ) !== $pass ) || is_super_admin() )  {
+                                        if ( ( ! empty( $_POST['pwd'] ) && wp_unslash( $_POST['pwd'] ) !== $pass ) || is_super_admin() ) {
                                                 $update_user['user_pass'] = $_POST['pass1'];
                                                 $pass_error               = false;
@@ -196 +196 @@
         // Email feedback.
         switch ( $email_error ) {
-                case 'invalid' :
-                        $feedback['email_invalid']  = __( 'That email address is invalid. Check the formatting and try again.', 'buddypress' );
-                        break;
-                case 'blocked' :
-                        $feedback['email_blocked']  = __( 'That email address is currently unavailable for use.', 'buddypress' );
-                        break;
-                case 'taken' :
-                        $feedback['email_taken']    = __( 'That email address is already taken.', 'buddypress' );
-                        break;
-                case 'empty' :
-                        $feedback['email_empty']    = __( 'Email address cannot be empty.', 'buddypress' );
-                        break;
-                case false :
+                case 'invalid':
+                        $feedback['email_invalid'] = __( 'That email address is invalid. Check the formatting and try again.', 'buddypress' );
+                        break;
+                case 'blocked':
+                        $feedback['email_blocked'] = __( 'That email address is currently unavailable for use.', 'buddypress' );
+                        break;
+                case 'taken':
+                        $feedback['email_taken'] = __( 'That email address is already taken.', 'buddypress' );
+                        break;
+                case 'empty':
+                        $feedback['email_empty'] = __( 'Email address cannot be empty.', 'buddypress' );
+                        break;
+                case false:
                         // No change.
                         break;
@@ -218 +218 @@
 
         // No errors so show a simple success message.
-        if ( ( ( false === $email_error ) || ( false == $pass_error ) ) && ( ( true === $pass_changed ) || ( true === $email_changed ) ) ) {
+        if ( ( ( false === $email_error ) || ( false === $pass_error ) ) && ( ( true === $pass_changed ) || ( true === $email_changed ) ) ) {
                 $feedback[]    = __( 'Your settings have been saved.', 'buddypress' );
                 $feedback_type = 'success';
@@ -297 +297 @@
                 }
 
-                $email_changed = wp_update_user( array(
-                        'ID'         => $user_id,
-                        'user_email' => trim( $pending_email['newemail'] ),
-                ) );
+                $email_changed = wp_update_user(
+                        array(
+                                'ID'         => $user_id,
+                                'user_email' => trim( $pending_email['newemail'] ),
+                        )
+                );
 
                 if ( $email_changed ) {