Changeset 4118

Timestamp:

03/11/2011 09:00:05 PM (14 years ago)

Author:

boonebgorges

Message:

Modifies @-mention regex to better handle @ signs in usernames. Fixes #2057. Props boonebgorges and SergeyBiryukov

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)

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

@@ -20 +20 @@
  */
 function bp_activity_find_mentions( $content ) {
-    $pattern = '/[@]+([A-Za-z0-9-_\.]+)/';
+    $pattern = '/[@]+([A-Za-z0-9-_\.@]+)/';
     preg_match_all( $pattern, $content, $usernames );
 

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

@@ -13 +13 @@
 
     /* 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 );
 

trunk/bp-forums/bp-forums-filters.php

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

trunk/bp-groups/bp-groups-notifications.php

@@ -254 +254 @@
 
     /* 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 );