Ticket #5185: 5185.patch

new file p-core/deprecated/1.9.php

@@ +1 @@
+<?php
+/**
+ * Deprecated Functions
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ * @deprecated Since 1.9
+ */
+
+/**
+ * Strips spaces from usernames that are created using add_user() and wp_insert_user()
+ *
+ * @package BuddyPress Core
+ * @deprecated BuddyPress (1.9)
+ */
+function bp_core_strip_username_spaces( $username ) {
+        _deprecated_function( __FUNCTION__, '1.9' );
+
+        // Don't alter the user_login of existing users, as it causes user_nicename problems.
+        // See http://trac.buddypress.org/ticket/2642
+        if ( username_exists( $username ) && ( !bp_is_username_compatibility_mode() ) )
+                return $username;
+
+        return str_replace( ' ', '-', $username );
+}
+

bp-members/bp-members-functions.php

@@ -945 +945 @@
 }
 
 /**
- * Strips spaces from usernames that are created using add_user() and wp_insert_user()
- *
- * @package BuddyPress Core
- */
-function bp_core_strip_username_spaces( $username ) {
-        // Don't alter the user_login of existing users, as it causes user_nicename problems.
-        // See http://trac.buddypress.org/ticket/2642
-        if ( username_exists( $username ) && ( !bp_is_username_compatibility_mode() ) )
-                return $username;
-
-        return str_replace( ' ', '-', $username );
-}
-add_action( 'pre_user_login', 'bp_core_strip_username_spaces' );
-
-/**
  * When a user logs in, check if they have been marked as a spammer. If yes then simply
  * redirect them to the home page and stop them from logging in.
  *
@@ -1211 +1196 @@
         if ( strpos( ' ' . $user_name, '_' ) != false )
                 $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character "_"!', 'buddypress' ) );
 
+        if ( false !== strpos( $user_name, ' ' ) ) {
+                $errors->add( 'user_name', __( 'Sorry, usernames may not contain spaces.', 'buddypress' ) );
+        }
+
         // Is the user_name all numeric?
         $match = array();
         preg_match( '/[0-9]*/', $user_name, $match );