Ticket #3114: bp-core-settings.patch

wp-content/plugins/buddypress/bp-core/bp-core-settings.php

@@ -24 +24 @@
         if ( !is_super_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
                 bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_my_profile() ) );
 }
 add_action( 'bp_setup_nav', 'bp_core_add_settings_nav' );
 
 /**** GENERAL SETTINGS ****/
 
 function bp_core_screen_general_settings() {
-        global $current_user, $bp_settings_updated, $pass_error;
+        global $current_user, $bp_settings_updated, $pass_error, $email_error;
 
         $bp_settings_updated = false;
         $pass_error = false;
+    $email_error = false;
 
         if ( isset($_POST['submit']) ) {
                 check_admin_referer('bp_settings_general');
 
                 require_once( WPINC . '/registration.php' );
 
                 // Form has been submitted and nonce checks out, lets do it.
 
-                if ( $_POST['email'] != '' )
-                        $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
+        do_action('bp_core_screen_general_settings_before_save');
 
-                if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-                        if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
-                                $current_user->user_pass = $_POST['pass1'];
-                        else
-                                $pass_error = true;
-                } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-                        $pass_error = true;
-                } else {
-                        unset( $current_user->user_pass );
-                }
+        if ( !$pass_error && !$email_error ) {
+            if ( $_POST['email'] != '' )
+                $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
 
-                if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
-                        $bp_settings_updated = true;
+            if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
+                if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
+                    $current_user->user_pass = $_POST['pass1'];
+                else
+                    $pass_error = true;
+            } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
+                $pass_error = true;
+            } else {
+                unset( $current_user->user_pass );
+            }
+
+            if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
+                $bp_settings_updated = true;
+        }
         }
 
         add_action( 'bp_template_title', 'bp_core_screen_general_settings_title' );
         add_action( 'bp_template_content', 'bp_core_screen_general_settings_content' );
 
         bp_core_load_template( apply_filters( 'bp_core_template_plugin', 'members/single/plugins' ) );
 }
 
 function bp_core_screen_general_settings_title() {
         _e( 'General Settings', 'buddypress' );
 }
 
 function bp_core_screen_general_settings_content() {
-        global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
+        global $bp, $current_user, $bp_settings_updated, $pass_error, $email_error;
+    
+    if ( $email_error ) {
+        $user_email = $_POST['email'];
+    } else {
+        $user_email = $current_user->user_email;
+    }
+
+    ?>
 
         <?php if ( $bp_settings_updated && !$pass_error ) { ?>
                 <div id="message" class="updated fade">
                         <p><?php _e( 'Changes Saved.', 'buddypress' ) ?></p>
                 </div>
         <?php } ?>
 
-        <?php if ( $pass_error && !$bp_settings_updated ) { ?>
+        <?php if ( ( $pass_error || $email_error ) && !$bp_settings_updated ) { ?>
                 <div id="message" class="error fade">
-                        <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
+            <?php if ( $pass_error ) { ?>
+                <p><?php _e( 'Your passwords did not match', 'buddypress' ) ?></p>
+            <?php } ?>
+
+            <?php if ( $email_error ) { ?>
+                <p><?php _e( 'Please enter a valid email address', 'buddypress' ) ?></p>
+            <?php } ?>
                 </div>
         <?php } ?>
 
         <form action="<?php echo $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/general' ?>" method="post" class="standard-form" id="settings-form">
                 <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
-                <input type="text" name="email" id="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" class="settings-input" />
+                <input type="text" name="email" id="email" value="<?php echo esc_attr( $user_email ); ?>" class="settings-input" />
 
                 <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ) ?></label>
                 <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'New Password', 'buddypress' ) ?><br />
                 <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small" /> &nbsp;<?php _e( 'Repeat New Password', 'buddypress' ) ?>
 
                 <div class="submit">
                         <input type="submit" name="submit" value="<?php _e( 'Save Changes', 'buddypress' ) ?>" id="submit" class="auto" />
                 </div>