Ticket #2194: 2194.diff

bp-activity/bp-activity-templatetags.php

@@ -419 +419 @@
 }
         function bp_get_activity_user_link() {
                 global $activities_template;
-                
+
                 if ( empty( $activities_template->activity->user_id ) )
                         $link = $activities_template->activity->primary_link;
                 else
@@ -638 +638 @@
 
         if ( $bp->loggedin_user->is_super_admin )
                 $can_delete = true;
-        
+
         if ( $activities_template->activity->user_id == $bp->loggedin_user->id )
                 $can_delete = true;
-                
+
         if ( $bp->is_item_admin && $bp->is_single_item )
                 $can_delete = true;
-        
+
         return apply_filters( 'bp_activity_user_can_delete', $can_delete );
 }
 
@@ -1110 +1110 @@
                         $content = $activities_template->activity->content;
 
                 $content = explode( '<span', $content );
-                $title = trim( strip_tags( html_entity_decode( utf8_encode( $content[0] ) ) ) );
+                $title = trim( strip_tags( html_entity_decode( $content[0], ENT_COMPAT, 'UTF-8' ) ) );
 
                 if ( ':' == substr( $title, -1 ) )
                         $title = substr( $title, 0, -1 );
@@ -1150 +1150 @@
                 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', html_entity_decode( str_replace( '%s', '', $content ), ENT_COMPAT, 'UTF-8' ) );
         }
 
 /**
@@ -1192 +1192 @@
 <?php
 }
 add_action( 'bp_head', 'bp_dtheme_group_feed' );
-?>
- No newline at end of file
+?>