Changeset 24848 for trunk/wp-includes/ms-functions.php

Timestamp:

07/29/2013 03:23:51 AM (11 years ago)

Author:

nacin

Message:

Remove "special" multisite spam check in the authentication API.

The spamming of a site no longer directly affects a user of said site.

Moves the spam check to the wp_authenticate filter. Networks in need
of enhanced spam-fighting should leverage this same technique.

Allow is_user_spammy() to accept a WP_User object.

props willnorris, brianhogg.
fixes #24771. see #19714.

File:

• trunk/wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1706 +1706 @@
  * @uses get_user_by()
  *
- * @param string $user_login Optional. Defaults to current user.
+ * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
+ *  or user login name as a string. 
  * @return bool
  */
-function is_user_spammy( $user_login = null ) {
-    if ( $user_login )
-        $user = get_user_by( 'login', $user_login );
-    else
-        $user = wp_get_current_user();
+function is_user_spammy( $user = null ) {
+    if ( ! is_a( $user, 'WP_User' ) ) {
+        if ( $user )
+            $user = get_user_by( 'login', $user );
+        else
+            $user = wp_get_current_user();
+    }
 
     return $user && isset( $user->spam ) && 1 == $user->spam;