Changeset 4294

Timestamp:

04/25/2011 02:25:30 PM (15 years ago)

Author:

djpaul

Message:

Fix private messaging recipients to work when BP_ENABLE_USERNAME_COMPATIBILITY_MODE is not set and user_nicename != user_login. See #3104

Location:

trunk

Files:

• bp-messages/bp-messages-functions.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-messages/bp-messages-functions.php

@@ -58 +58 @@
                 // Loop the recipients and convert all usernames to user_ids where needed
                 foreach( (array) $recipients as $recipient ) {
-                        if ( is_numeric( trim( $recipient ) ) )
-                                $recipient_ids[] = (int)trim( $recipient );
-
-                        if ( $recipient_id = bp_core_get_userid( trim( $recipient ) ) )
-                                $recipient_ids[] = (int)$recipient_id;
+                        $recipient = trim( $recipient );
+                        if ( empty( $recipient ) )
+                                continue;
+
+                        if ( is_numeric( $recipient ) ) {
+                                if ( bp_core_get_core_userdata( (int) $recipient ) )
+                                        $recipient_ids[] = (int) $recipient;
+
+                        } else {
+                                if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) ) 
+                                        $recipient_id = bp_core_get_userid( $recipient ); 
+                                else
+                                        $recipient_id = bp_core_get_userid_from_nicename( $recipient );
+
+                                $recipient_ids[] = (int) $recipient_id;
+                        }
                 }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -642 +642 @@
         }
 
-
         if ( !empty( $user_ids ) ) {
                 foreach ( $user_ids as $user_id ) {
-                        $ud = get_userdata($user_id);
-                        $username = $ud->user_login;
+                        $ud = get_userdata( $user_id );
+                        if ( !$ud )
+                                continue;
+
+                        if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) ) 
+                                $username = $ud->user_login;
+                        else
+                                $username = $ud->user_nicename;
+
                         echo '<span id="link-' . $username . '" value="' . bp_core_get_user_domain( $user_id ) . '"></span>' . bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15 ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')
                         ';