Changeset 2114 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

11/24/2009 10:05:01 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-templatetags.php

@@ -314 +314 @@
                         $content = bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name, true, false, false );
 
-                /* Add 'the_content' filter to activity to allow existing plugins to replace text as they would on post text. (extra smilies etc) */
-                $content = apply_filters( 'the_content', $content );
-
                 return apply_filters( 'bp_get_activity_content', $content, $activities_template->activity->component_name, $activities_template->activity->component_action );
         }
@@ -488 +485 @@
                         else
                                 unset($selected);
-
-                        $component_name = attribute_escape( $component_name );
 
                         $component_name = attribute_escape( $component_name );
@@ -559 +554 @@
                 global $activities_template;
 
-                return apply_filters( 'bp_get_activity_feed_item_title', md5( $activities_template->activity->date_recorded . '-' . $activities_template->activity->content ) );
+                return apply_filters( 'bp_get_activity_feed_item_guid', md5( $activities_template->activity->date_recorded . '-' . $activities_template->activity->content ) );
         }