From 8caab555bd76ff01e955f773616f5689cdc06b26 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 2 Feb 2010 18:00:45 +0000
Subject: [PATCH] Integrate update_profile_email() into user-edit.php. see
 #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@12928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php | 21 ---------------------
 wp-admin/user-edit.php   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 4ed3d9d85f..cff25701d8 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -266,23 +266,6 @@ All at ###SITENAME###
 }
 add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
-function update_profile_email() {
-	global $current_user, $wpdb;
-	if ( isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-		$new_email = get_option( $current_user->ID . '_new_email' );
-		if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
-			$user->ID = $current_user->ID;
-			$user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
-			if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
-				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
-			wp_update_user( get_object_vars( $user ) );
-			delete_option( $current_user->ID . '_new_email' );
-			wp_redirect( add_query_arg( array('updated' => 'true'), admin_url( 'profile.php' ) ) );
-			die();
-		}
-	}
-}
-
 function send_confirmation_on_profile_email() {
 	global $errors, $wpdb, $current_user, $current_site;
 	if ( ! is_object($errors) )
@@ -803,10 +786,6 @@ function choose_primary_blog() {
 	<?php
 }
 
-if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) ) {
-	add_action( 'admin_init', 'update_profile_email' );
-}
-
 function stripslashes_from_options( $blog_id ) {
 	global $wpdb;
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 39cb365ae2..52ba22cef1 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -65,6 +65,21 @@ function use_ssl_preference($user) {
 if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID )
 	wp_die( __( 'You do not have permission to edit this user.' ) );
 
+// Execute confirmed email change. See send_confirmation_on_profile_email().
+if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
+	$new_email = get_option( $current_user->ID . '_new_email' );
+	if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+		$user->ID = $current_user->ID;
+		$user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
+		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
+			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		wp_update_user( get_object_vars( $user ) );
+		delete_option( $current_user->ID . '_new_email' );
+		wp_redirect( add_query_arg( array('updated' => 'true'), admin_url( 'profile.php' ) ) );
+		die();
+	}
+}
+
 switch ($action) {
 case 'switchposts':