Skip to:
Content

BuddyPress.org

Changeset 2663


Ignore:
Timestamp:
02/11/2010 11:17:32 AM (17 years ago)
Author:
apeatling
Message:

Fixes #1905

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-notifications.php

    r2507 r2663  
    3636
    3737---------------------
    38 ', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep($content) ), $message_link );
     38', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes($content) ), $message_link );
    3939
    4040                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    7272
    7373---------------------
    74 ', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep( $content ) ), $thread_link );
     74', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes( $content ) ), $thread_link );
    7575
    7676                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    107107
    108108---------------------
    109 ', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep( $content ) ), $thread_link );
     109', 'buddypress' ), $poster_name, bp_activity_filter_kses( stripslashes( $content ) ), $thread_link );
    110110
    111111                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );

  • trunk/bp-groups/bp-groups-filters.php

    r2375 r2663  
    44add_filter( 'bp_get_group_description', 'wptexturize' );
    55add_filter( 'bp_get_group_description_excerpt', 'wptexturize' );
    6 add_filter( 'bp_get_the_site_group_description', 'wptexturize' );
    7 add_filter( 'bp_get_the_site_group_description_excerpt', 'wptexturize' );
    86add_filter( 'bp_get_group_name', 'wptexturize' );
    9 add_filter( 'bp_get_the_site_group_name', 'wptexturize' );
    107
    118add_filter( 'bp_get_group_description', 'convert_smilies' );
    129add_filter( 'bp_get_group_description_excerpt', 'convert_smilies' );
    13 add_filter( 'bp_get_the_site_group_description', 'convert_smilies' );
    14 add_filter( 'bp_get_the_site_group_description_excerpt', 'convert_smilies' );
    1510
    1611add_filter( 'bp_get_group_description', 'convert_chars' );
    1712add_filter( 'bp_get_group_description_excerpt', 'convert_chars' );
    1813add_filter( 'bp_get_group_name', 'convert_chars' );
    19 add_filter( 'bp_get_the_site_group_name', 'convert_chars' );
    20 add_filter( 'bp_get_the_site_group_description', 'convert_chars' );
    21 add_filter( 'bp_get_the_site_group_description_excerpt', 'convert_chars' );
    2214
    2315add_filter( 'bp_get_group_description', 'wpautop' );
    2416add_filter( 'bp_get_group_description_excerpt', 'wpautop' );
    25 add_filter( 'bp_get_the_site_group_description', 'wpautop' );
    26 add_filter( 'bp_get_the_site_group_description_excerpt', 'wpautop' );
    2717
    2818add_filter( 'bp_get_group_description', 'make_clickable' );
    … …  
    3121add_filter( 'bp_get_group_name', 'wp_filter_kses', 1 );
    3222add_filter( 'bp_get_group_permalink', 'wp_filter_kses', 1 );
    33 add_filter( 'bp_get_group_description', 'wp_filter_kses', 1 );
     23add_filter( 'bp_get_group_description', 'bp_groups_filter_kses', 1 );
    3424add_filter( 'bp_get_group_description_excerpt', 'wp_filter_kses', 1 );
    35 add_filter( 'bp_get_the_site_group_name', 'wp_filter_kses', 1 );
    36 add_filter( 'bp_get_the_site_group_description', 'wp_filter_kses', 1 );
    37 add_filter( 'bp_get_the_site_group_description_excerpt', 'wp_filter_kses', 1 );
    3825add_filter( 'groups_group_name_before_save', 'wp_filter_kses', 1 );
    3926add_filter( 'groups_group_description_before_save', 'wp_filter_kses', 1 );
    … …  
    5138add_filter( 'bp_get_group_total_for_member', 'bp_core_number_format' );
    5239add_filter( 'bp_get_group_total_members', 'bp_core_number_format' );
     40
     41function bp_groups_filter_kses( $content ) {
     42        global $allowedtags;
     43
     44        $groups_allowedtags = $allowedtags;
     45        $groups_allowedtags['a']['class'] = array();
     46        $groups_allowedtags['img'] = array();
     47        $groups_allowedtags['img']['src'] = array();
     48        $groups_allowedtags['img']['alt'] = array();
     49        $groups_allowedtags['img']['class'] = array();
     50        $groups_allowedtags['img']['width'] = array();
     51        $groups_allowedtags['img']['height'] = array();
     52        $groups_allowedtags['img']['class'] = array();
     53        $groups_allowedtags['img']['id'] = array();
     54        $groups_allowedtags['code'] = array();
     55
     56        $groups_allowedtags = apply_filters( 'bp_groups_filter_kses', $groups_allowedtags );
     57        return wp_kses( $content, $groups_allowedtags );
     58}
    5359
    5460/**** Filters for group forums ****/

  • trunk/bp-groups/bp-groups-notifications.php

    r2576 r2663  
    2525
    2626---------------------
    27 ', 'buddypress' ), stripslashes( $group->name ), $group_link );
     27', 'buddypress' ), $group->name, $group_link );
    2828
    2929                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    5656        // Set up and send the message
    5757        $to = $ud->user_email;
    58         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), stripslashes( $group->name ) );
     58        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
    5959
    6060$message = sprintf( __(
    … …  
    6969
    7070---------------------
    71 ', 'buddypress' ), $requesting_user_name, stripslashes( $group->name ), $group_requests, $requesting_user_name, $profile_link );
     71', 'buddypress' ), $requesting_user_name, $group->name, $group_requests, $requesting_user_name, $profile_link );
    7272
    7373        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    100100
    101101        if ( $accepted ) {
    102                 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), stripslashes( $group->name ) );
     102                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
    103103                $message = sprintf( __(
    104104'Your membership request for the group "%s" has been accepted.
    … …  
    107107
    108108---------------------
    109 ', 'buddypress' ), stripslashes( $group->name ), $group_link );
     109', 'buddypress' ), $group->name, $group_link );
    110110
    111111        } else {
    112                 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), stripslashes( $group->name ) );
     112                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
    113113                $message = sprintf( __(
    114114'Your membership request for the group "%s" has been rejected.
    … …  
    117117
    118118---------------------
    119 ', 'buddypress' ), stripslashes( $group->name ), $group_link );
     119', 'buddypress' ), $group->name, $group_link );
    120120        }
    121121
    … …  
    152152        $to = $ud->user_email;
    153153
    154         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), stripslashes( $group->name ) );
     154        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
    155155
    156156        $message = sprintf( __(
    … …  
    160160
    161161---------------------
    162 ', 'buddypress' ), $promoted_to, stripslashes( $group->name ), $group_link );
     162', 'buddypress' ), $promoted_to, $group->name, $group_link );
    163163
    164164        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    196196                $to = $invited_ud->user_email;
    197197
    198                 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), stripslashes( $group->name ) );
     198                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
    199199
    200200                $message = sprintf( __(
    … …  
    208208
    209209---------------------
    210 ', 'buddypress' ), $inviter_name, stripslashes( $group->name ), $invites_link, $group_link, $inviter_name, $inviter_link );
     210', 'buddypress' ), $inviter_name, $group->name, $invites_link, $group_link, $inviter_name, $inviter_link );
    211211
    212212                $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
    … …  
    248248                        $ud = bp_core_get_core_userdata( $receiver_user_id );
    249249                        $to = $ud->user_email;
    250                         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), stripslashes( $poster_name ), wp_filter_kses( stripslashes( $group->name ) ) );
     250                        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), stripslashes( $poster_name ), $group->name );
    251251
    252252$message = sprintf( __(
    … …  
    258258
    259259---------------------
    260 ', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep( $group->name ) ), wp_filter_kses( stripslashes_deep($content) ), $message_link );
     260', 'buddypress' ), $poster_name, $group->name, bp_groups_filter_kses( stripslashes( $content ) ), $message_link );
    261261
    262262                        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
Note: See TracChangeset for help on using the changeset viewer.