Ticket #4622: 4622.01.patch

bp-activity/bp-activity-functions.php

@@ -48 +48 @@
 
         // We've found some mentions! Check to see if users exist
         foreach( (array) $usernames as $key => $username ) {
-                if ( bp_is_username_compatibility_mode() ) {
-                        $user_id = username_exists( $username );
-                } else {
-                        $user_id = bp_core_get_userid_from_nicename( $username );
-                }
+                $user_id = bp_core_get_userid_from_nicename( $username );
 
                 // user ID exists, so let's add it to our array
                 if ( ! empty( $user_id ) ) {

bp-members/bp-members-functions.php

@@ -271 +271 @@
                 $update_cache = false;
         }
 
-        // Check $username for empty spaces and default to nicename if found
-        if ( strstr( $username, ' ' ) )
-                $username = bp_members_get_user_nicename( $user_id );
-
         // Add this to cache
         if ( ( true == $update_cache ) && !empty( $username ) )
                 wp_cache_set( 'bp_user_username_' . $user_id, $username, 'bp' );
@@ -848 +844 @@
 }
 
 /**
- * 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.
  *

bp-members/bp-members-template.php

@@ -950 +950 @@
                 return apply_filters( 'bp_get_displayed_user_username', $username );
         }
 
+function bp_displayed_user_nicename() {
+        echo bp_get_displayed_user_nicename();
+}
+        function bp_get_displayed_user_nicename() {
+                global $bp;
+
+                if ( bp_displayed_user_id() ) {
+                        $username = $bp->displayed_user->userdata->user_nicename;
+                } else {
+                        $username = '';
+                }
+
+                return apply_filters( 'bp_get_displayed_user_nicename', $username );
+        }
+
 function bp_loggedin_user_username() {
         echo bp_get_loggedin_user_username();
 }
@@ -965 +980 @@
                 return apply_filters( 'bp_get_loggedin_user_username', $username );
         }
 
+function bp_loggedin_user_nicename() {
+        echo bp_get_loggedin_user_nicename();
+}
+        function bp_get_loggedin_user_nicename() {
+                global $bp;
+
+                if ( bp_loggedin_user_id() ) {
+                        $username = $bp->loggedin_user->userdata->user_nicename;
+                } else {
+                        $username = '';
+                }
+
+                return apply_filters( 'bp_get_loggedin_user_nicename', $username );
+        }
+
 /** Signup Form ***************************************************************/
 
 /**

bp-templates/bp-legacy/buddypress/members/single/member-header.php

@@ -21 +21 @@
 
 <div id="item-header-content">
 
-        <h2 class="user-nicename">@<?php bp_displayed_user_username(); ?></h2>
+        <h2 class="user-nicename">@<?php bp_displayed_user_nicename(); ?></h2>
         <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
 
         <?php do_action( 'bp_before_member_header_meta' ); ?>

bp-themes/bp-default/members/single/member-header.php

@@ -25 +25 @@
                 <a href="<?php bp_displayed_user_link(); ?>"><?php bp_displayed_user_fullname(); ?></a>
         </h2>
 
-        <span class="user-nicename">@<?php bp_displayed_user_username(); ?></span>
+        <span class="user-nicename">@<?php bp_displayed_user_nicename(); ?></span>
         <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ); ?></span>
 
         <?php do_action( 'bp_before_member_header_meta' ); ?>