Changeset 12842

Timestamp:

01/26/2010 05:51:50 PM (15 years ago)

Author:

ryan

Message:

Move update_signup_email_from_profile() logic into user-edit.php. see #11644

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• user-edit.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -1162 +1162 @@
 add_action('admin_menu', 'blogs_page_init');
 
-function update_signup_email_from_profile( $user_id ) {
-    global $wpdb;
-    $user_login = $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->users} WHERE ID = %d", $user_id ) );
-    if ( $user_login && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user_login ) ) ) {
-        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
-    }
-}
-add_action( 'edit_user_profile_update', 'update_signup_email_from_profile' );
-
 function stripslashes_from_options( $blog_id ) {
     global $wpdb;

trunk/wp-admin/user-edit.php

@@ -90 +90 @@
     $errors = edit_user($user_id);
 } else {
+    $user = get_userdata( $user_id );
+
+    // Update the email address in signups, if present.
+    if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) )
+        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+
     // WPMU must delete the user from the current blog if WP added him after editing.
     $delete_role = false;