Ticket #2057: 2057.patch

bp-activity/bp-activity-functions.php

@@ -19 +19 @@
  * @return array $usernames Array of the found usernames that match existing users
  */
 function bp_activity_find_mentions( $content ) {
-        $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
+        $pattern = '/[@]+([A-Za-z0-9-_\.@]+)/';
         preg_match_all( $pattern, $content, $usernames );
 
         // Make sure there's only one instance of each username

bp-activity/bp-activity-notifications.php

@@ -12 +12 @@
         global $bp;
 
         /* Scan for @username strings in an activity update. Notify each user. */
-        $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
+        $pattern = '/[@]+([A-Za-z0-9-_\.@]+)/';
         preg_match_all( $pattern, $content, $usernames );
 
         /* Make sure there's only one instance of each username */

bp-forums/bp-forums-filters.php

@@ -123 +123 @@
 
         $content = htmlspecialchars_decode( $content );
 
-        $pattern = "|<a href=&#039;" . bp_get_root_domain() . "/" . $bp->members->slug . "/[A-Za-z0-9-_\.]+/&#039; rel=&#039;nofollow&#039;>(@[A-Za-z0-9-_\.]+)</a>|";
+        $pattern = "|<a href=&#039;" . bp_get_root_domain() . "/" . $bp->members->slug . "/[A-Za-z0-9-_\.]+/&#039; rel=&#039;nofollow&#039;>(@[A-Za-z0-9-_\.@]+)</a>|";
 
         $content = preg_replace( $pattern, "$1", $content );
 

bp-groups/bp-groups-notifications.php

@@ -253 +253 @@
         global $bp;
 
         /* Scan for @username strings in an activity update. Notify each user. */
-        $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
+        $pattern = '/[@]+([A-Za-z0-9-_\.@]+)/';
         preg_match_all( $pattern, $content, $usernames );
 
         /* Make sure there's only one instance of each username */