Skip to:
Content

BuddyPress.org

Ticket #2194: 2194.diff

File 2194.diff, 1.7 KB (added by sorich87, 9 years ago)
  • bp-activity/bp-activity-templatetags.php

     
    419419}
    420420        function bp_get_activity_user_link() {
    421421                global $activities_template;
    422                
     422
    423423                if ( empty( $activities_template->activity->user_id ) )
    424424                        $link = $activities_template->activity->primary_link;
    425425                else
     
    638638
    639639        if ( $bp->loggedin_user->is_super_admin )
    640640                $can_delete = true;
    641        
     641
    642642        if ( $activities_template->activity->user_id == $bp->loggedin_user->id )
    643643                $can_delete = true;
    644                
     644
    645645        if ( $bp->is_item_admin && $bp->is_single_item )
    646646                $can_delete = true;
    647        
     647
    648648        return apply_filters( 'bp_activity_user_can_delete', $can_delete );
    649649}
    650650
     
    11101110                        $content = $activities_template->activity->content;
    11111111
    11121112                $content = explode( '<span', $content );
    1113                 $title = trim( strip_tags( html_entity_decode( utf8_encode( $content[0] ) ) ) );
     1113                $title = trim( strip_tags( html_entity_decode( $content[0], ENT_COMPAT, 'UTF-8' ) ) );
    11141114
    11151115                if ( ':' == substr( $title, -1 ) )
    11161116                        $title = substr( $title, 0, -1 );
     
    11501150                else
    11511151                        $content = $activities_template->activity->action . ' ' . $activities_template->activity->content;
    11521152
    1153                 return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
     1153                return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ), ENT_COMPAT, 'UTF-8' ) );
    11541154        }
    11551155
    11561156/**
     
    11921192<?php
    11931193}
    11941194add_action( 'bp_head', 'bp_dtheme_group_feed' );
    1195 ?>
    1196  No newline at end of file
     1195?>