Changeset 4367 for trunk/bp-activity/bp-activity-filters.php

Timestamp:

05/15/2011 10:40:03 PM (13 years ago)

Author:

boonebgorges

Message:

Reconfigures the way that new activity mentions are stored and incremented, so that counts more accurately reflect new and deleted activity items. Fixes #2082

File:

• trunk/bp-activity/bp-activity-filters.php (modified) (2 diffs)

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

@@ -113 +113 @@
  * @param string $content The activity content
  */
-function bp_activity_at_name_filter( $content ) {
+function bp_activity_at_name_filter( $activity ) {
+    // Only run this function once for a given activity item
+    remove_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
+
+    $content = $activity->content;
+
     $usernames = bp_activity_find_mentions( $content );
 
@@ -126 +131 @@
 
         // Increase the number of new @ mentions for the user
-        $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
-        update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
+        bp_activity_adjust_mention_count( $activity->id, 'add' );
 
         $content = preg_replace( '/(@' . $username . '\b)/', "<a href='" . bp_core_get_user_domain( $user_id ) . "' rel='nofollow'>@$username</a>", $content );
     }
 
-    return $content;
+    // Resave the activity item with the linked usernames
+    $activity->content = $content;
+    $activity->save();
 }
-add_filter( 'bp_activity_new_update_content',     'bp_activity_at_name_filter' );
-add_filter( 'groups_activity_new_update_content', 'bp_activity_at_name_filter' );
-add_filter( 'pre_comment_content',                'bp_activity_at_name_filter' );
-add_filter( 'group_forum_topic_text_before_save', 'bp_activity_at_name_filter' );
-add_filter( 'group_forum_post_text_before_save',  'bp_activity_at_name_filter' );
-add_filter( 'bp_activity_comment_content',        'bp_activity_at_name_filter' );
+add_filter( 'bp_activity_after_save', 'bp_activity_at_name_filter' );
 
 function bp_activity_make_nofollow_filter( $text ) {