Changeset 4294 for trunk/bp-messages/bp-messages-functions.php

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

File:

• trunk/bp-messages/bp-messages-functions.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;
+                        }
                 }