Ticket #23190: 23190.2.patch

wp-includes/ms-deprecated.php

@@ -270 +270 @@
         }
         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;
+}

wp-includes/ms-functions.php

@@ -1317 +1317 @@
 }
 
 /**
- * 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 +1713 @@
  * @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 );
 }