Changeset 4277

Timestamp:

04/24/2011 12:33:51 PM (15 years ago)

Author:

djpaul

Message:

Fix at-notifications to work when BP_ENABLE_USERNAME_COMPATIBILITY_MODE is not set and user_nicename != user_login

Location:

trunk/bp-activity

Files:

• bp-activity-filters.php (modified) (2 diffs)
• bp-activity-functions.php (modified) (1 diff)
• bp-activity-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -117 +117 @@
 
         foreach( (array)$usernames as $username ) {
-                if ( !$user_id = username_exists( $username ) )
+                if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+                        $user_id = username_exists( $username );
+                else
+                        $user_id = bp_core_get_userid_from_nicename( $username );
+
+                if ( empty( $user_id ) )
                         continue;
 
@@ -124 +129 @@
                 update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
 
-                $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( bp_core_get_userid( $username ) ) . "' rel='nofollow'>@$username</a>", $content );
+                $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
         }
 

trunk/bp-activity/bp-activity-functions.php

@@ -43 +43 @@
         if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
                 foreach( (array)$usernames as $username ) {
-                        if ( !$user_id = username_exists( $username ) )
+                        if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+                                $user_id = username_exists( $username );
+                        else
+                                $user_id = bp_core_get_userid_from_nicename( $username );
+
+                        if ( empty( $user_id ) )
                                 continue;
 

trunk/bp-activity/bp-activity-notifications.php

@@ -21 +21 @@
 
         foreach( (array)$usernames as $username ) {
-                if ( !$receiver_user_id = bp_core_get_userid( $username ) )
+                if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+                        $receiver_user_id = bp_core_get_userid( $username );
+                else
+                        $receiver_user_id = bp_core_get_userid_from_nicename( $username );
+
+                if ( empty( $receiver_user_id ) )
                         continue;