Changeset 4789

Timestamp:

03/06/2013 06:39:31 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Pass complete content into activity stream items. Create excerpt on output rather than input. Fixes #2237.

File:

• trunk/includes/extend/buddypress/activity.php (modified) (2 diffs)

trunk/includes/extend/buddypress/activity.php

@@ -421 +421 @@
 
         // Activity action & text
-        $activity_text    = sprintf( __( '%1$s started the topic %2$s in the forum %3$s', 'bbpress' ), $user_link, $topic_link, $forum_link    );
-        $activity_action  = apply_filters( 'bbp_activity_topic_create',                $activity_text, $user_id,   $topic_id,   $forum_id      );
-        $activity_content = apply_filters( 'bbp_activity_topic_create_excerpt',        bp_create_excerpt( $topic_content ),     $topic_content );
+        $activity_text    = sprintf( __( '%1$s started the topic %2$s in the forum %3$s', 'bbpress' ), $user_link, $topic_link, $forum_link );
+        $activity_action  = apply_filters( 'bbp_activity_topic_create',         $activity_text, $user_id,   $topic_id,   $forum_id );
+        $activity_content = apply_filters( 'bbp_activity_topic_create_excerpt', $topic_content                                     );
 
         // Compile the activity stream results
@@ -571 +571 @@
 
         // Activity action & text
-        $activity_text    = sprintf( __( '%1$s replied to the topic %2$s in the forum %3$s', 'bbpress' ), $user_link, $topic_link, $forum_link    );
-        $activity_action  = apply_filters( 'bbp_activity_reply_create',         $activity_text, $user_id,   $reply_id,   $topic_id      );
-        $activity_content = apply_filters( 'bbp_activity_reply_create_excerpt', bp_create_excerpt( $reply_content ),     $reply_content );
+        $activity_text    = sprintf( __( '%1$s replied to the topic %2$s in the forum %3$s', 'bbpress' ), $user_link, $topic_link, $forum_link );
+        $activity_action  = apply_filters( 'bbp_activity_reply_create',         $activity_text, $user_id, $reply_id,  $topic_id );
+        $activity_content = apply_filters( 'bbp_activity_reply_create_excerpt', $reply_content                                  );
 
         // Compile the activity stream results