Index: wp-includes/ms-deprecated.php
===================================================================
--- wp-includes/ms-deprecated.php	(revision 23435)
+++ wp-includes/ms-deprecated.php	(working copy)
@@ -270,3 +270,34 @@
 	}
 	return $url;
 }
+
+/**
+ * Get a numeric user ID from either an email address or a login.
+ *
+ * A numeric string is considered to be an existing user ID
+ * and is simply returned as such.
+ *
+ * @since MU
+ * @deprecated 3.6.0
+ * @deprecated Use get_user_by()
+ * @uses is_email()
+ *
+ * @param string $string Either an email address or a login.
+ * @return int
+ */
+function get_user_id_from_string( $string ) {
+	$user_id = 0;
+	if ( is_email( $string ) ) {
+		$user = get_user_by('email', $string);
+		if ( $user )
+			$user_id = $user->ID;
+	} elseif ( is_numeric( $string ) ) {
+		$user_id = $string;
+	} else {
+		$user = get_user_by('login', $string);
+		if ( $user )
+			$user_id = $user->ID;
+	}
+
+	return $user_id;
+}
Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 23435)
+++ wp-includes/ms-functions.php	(working copy)
@@ -1317,32 +1317,6 @@
 }
 
 /**
- * Get a numeric user ID from either an email address or a login.
- *
- * @since MU
- * @uses is_email()
- *
- * @param string $string
- * @return int
- */
-function get_user_id_from_string( $string ) {
-	$user_id = 0;
-	if ( is_email( $string ) ) {
-		$user = get_user_by('email', $string);
-		if ( $user )
-			$user_id = $user->ID;
-	} elseif ( is_numeric( $string ) ) {
-		$user_id = $string;
-	} else {
-		$user = get_user_by('login', $string);
-		if ( $user )
-			$user_id = $user->ID;
-	}
-
-	return $user_id;
-}
-
-/**
  * Get a user's most recent post.
  *
  * Walks through each of a user's blogs to find the post with
@@ -1739,11 +1713,10 @@
  * @return bool
  */
 function is_user_spammy( $username = 0 ) {
-	if ( $username == 0 ) {
+	if ( $username == 0 )
 		$user = wp_get_current_user();
-	} else {
+	else
 		$user = get_user_by( 'login', $username );
-	}
 
 	return ( isset( $user->spam ) && $user->spam == 1 );
 }