Changeset 1833

Timestamp:

12/08/2008 11:49:44 PM (18 years ago)

Author:

sambauers

Message:

Fix broken email address editing in profile - Fixes #1004 for branches/0.9

File:

• branches/0.9/profile-edit.php (modified) (5 diffs)

branches/0.9/profile-edit.php

@@ -27 +27 @@
         $assignable_caps = get_assignable_caps();
 }
-$updated = false;
-$user_email = true;
 
 $errors = new WP_Error;
@@ -49 +47 @@
         }
 
+        // Find out if we have a valid email address
+        if ( !$user_email = bb_verify_email( $user_email ) ) {
+                $errors->add( 'user_email', __( 'Invalid email address' ), array( 'data' => $_POST['user_email'] ) );
+        }
+
         if ( bb_current_user_can('edit_users') ) {
                 if ( isset($_POST['delete-user']) && $_POST['delete-user'] && $bb_current_id != $user->ID ) {
@@ -55 +58 @@
                         exit;
                 }
-
-                if ( isset($_POST['user_email']) )
-                        if ( !$user_email = bb_verify_email( $_POST['user_email'] ) )
-                                $errors->add( 'user_email', __( 'Invalid email address' ), array( 'data' => $_POST['user_email'] ) );
 
                 $user_obj = new BB_User( $user->ID );
@@ -96 +95 @@
         }
 
-        $updated = true;
+        if ( !$errors->get_error_codes() ) {
+                if ( bb_current_user_can( 'edit_user', $user->ID ) ) {
+                        bb_update_user( $user->ID, $user_email, $user_url );
 
-        if ( $user_email && !$errors->get_error_codes() ) {
-                if ( bb_current_user_can( 'edit_user', $user->ID ) ) {
-                        if ( is_string($user_email) ) {
-                                bb_update_user( $user->ID, $user_email, $user_url );
-                        } else {
-                                bb_update_user( $user->ID, $user->user_email, $user_url );
-                        }
                         foreach( $profile_info_keys as $key => $label )
                                 if ( strpos($key, 'user_') !== 0 )
@@ -138 +132 @@
 
                 wp_redirect( add_query_arg( 'updated', 'true', get_user_profile_link( $user->ID ) ) );
-                exit;
+                exit;   
         }
 }
 
-bb_load_template( 'profile-edit.php', array('profile_info_keys', 'profile_admin_keys', 'assignable_caps', 'updated', 'user_email', 'bb_roles', 'errors') );
+bb_load_template( 'profile-edit.php', array('profile_info_keys', 'profile_admin_keys', 'assignable_caps', 'user_email', 'bb_roles', 'errors') );
 
 ?>