Changeset 5832 for trunk/bp-settings/bp-settings-actions.php
- Timestamp:
- 02/23/2012 07:27:29 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-settings/bp-settings-actions.php
r5829 r5832 47 47 $pass_error = false; // invalid|mismatch|empty|nochange 48 48 $pass_changed = false; // true if the user changes their password 49 $email_changed = false; // true if the user changes their email 49 50 $feedback_type = 'error'; // success|error 50 51 $feedback = array(); // array of strings for feedback 51 52 52 /** Handle Form ***********************************************************/53 53 54 54 if ( isset( $_POST['submit'] ) ) { … … 69 69 $user_email = sanitize_email( esc_html( trim( $_POST['email'] ) ) ); 70 70 71 // Skip this if no change to email71 // User is changing email address 72 72 if ( $bp->displayed_user->userdata->user_email != $user_email ) { 73 73 … … 93 93 } 94 94 95 // Yay we made it! 96 if ( false === $email_error ) { 97 $update_user->user_email = $user_email; 98 $email_changed = true; 99 } 100 95 101 // No change 96 102 } else { 97 $email_error = 'nochange'; 98 } 99 100 // Yay we made it! 101 if ( false === $email_error ) { 102 $update_user->user_email = $user_email; 103 $email_error = false; 103 104 } 104 105 … … 124 125 // Both password fields were empty 125 126 } elseif ( empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) { 126 $pass_error = 'nochange';127 $pass_error = false; 127 128 128 129 // One of the password boxes was left empty … … 169 170 $feedback['email_empty'] = __( 'Email address cannot be empty.', 'buddypress' ); 170 171 break; 171 case 'nochange':172 $email_error = false;172 case false : 173 // No change 173 174 break; 174 175 } … … 185 186 $feedback['pass_empty'] = __( 'One of the password fields was empty.', 'buddypress' ); 186 187 break; 187 case 'nochange':188 $pass_error = false;188 case false : 189 // No change 189 190 break; 190 191 } 191 192 192 193 // No errors so show a simple success message 193 if ( ( false === $email_error ) && ( ( false == $pass_error ) && ( true === $pass_changed ) ) ) {194 if ( ( ( false === $email_error ) || ( false == $pass_error ) ) && ( ( true === $pass_changed ) || ( true === $email_changed ) ) ) { 194 195 $feedback[] = __( 'Your settings have been saved.', 'buddypress' ); 195 196 $feedback_type = 'success'; 196 197 197 198 // Some kind of errors occurred 198 } elseif ( ( false === $email_error ) && ( ( false == $pass_error ) && ( false === $pass_changed ) ) ) {199 } elseif ( ( ( false === $email_error ) || ( false === $pass_error ) ) && ( ( false === $pass_changed ) || ( false === $email_changed ) ) ) { 199 200 if ( bp_is_my_profile() ) { 200 201 $feedback['nochange'] = __( 'No changes were made to your account.', 'buddypress' );
Note: See TracChangeset
for help on using the changeset viewer.