Ticket #2194: 2194.001.diff

bp-activity/feeds/bp-activity-sitewide-feed.php

@@ -32 +32 @@
                 <?php while ( bp_activities() ) : bp_the_activity(); ?>
                         <item>
                                 <guid><?php bp_activity_thread_permalink() ?></guid>
-                                <title><![CDATA[<?php bp_activity_feed_item_title() ?>]]></title>
+                                <title><?php bp_activity_feed_item_title() ?></title>
                                 <link><?php bp_activity_thread_permalink() ?></link>
                                 <pubDate><?php echo mysql2date('D, d M Y H:i:s O', bp_get_activity_feed_item_date(), false); ?></pubDate>
 

bp-activity/bp-activity-templatetags.php

@@ -1028 +1028 @@
                         $content = $activities_template->activity->content;
 
                 $content = explode( '<span', $content );
-                $title = trim( strip_tags( html_entity_decode( utf8_encode( $content[0] ) ) ) );
+                $title = strip_tags( ent2ncr( trim( convert_chars( $content[0] ) ) ) );
 
                 if ( ':' == substr( $title, -1 ) )
                         $title = substr( $title, 0, -1 );
 
                 if ( 'activity_update' == $activities_template->activity->type )
-                        $title .= ': ' . strip_tags( bp_create_excerpt( $activities_template->activity->content, 15 ) );
+                        $title .= ': ' . bp_create_excerpt( $activities_template->activity->content, 15 );
 
                 return apply_filters( 'bp_get_activity_feed_item_title', $title );
         }
@@ -1068 +1068 @@
                 else
                         $content = $activities_template->activity->action . ' ' . $activities_template->activity->content;
 
-                return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
+                return apply_filters( 'bp_get_activity_feed_item_description', ent2ncr( convert_chars( str_replace( '%s', '', $content ) ) ) );
         }
 
 ?>
+ No newline at end of file