Skip to:
Content

BuddyPress.org

Changeset 13822


Ignore:
Timestamp:
04/29/2024 06:50:42 PM (21 months ago)
Author:
imath
Message:

BP Legacy: improve PHP code standards using WPCS

See #7228 (trunk)

Location:
trunk/src/bp-templates/bp-legacy
Files:
59 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/bp-templates/bp-legacy/buddypress-functions.php

    r13709 r13822  
    512512        $class = did_action( 'admin_bar_menu' ) ? 'admin-bar-on' : 'admin-bar-off';
    513513
    514         echo '<div id="sitewide-notice" class="' . $class . '">';
     514        echo '<div id="sitewide-notice" class="' . esc_attr( $class ) . '">';
    515515        bp_message_get_notices();
    516516        echo '</div>';
    … …  
    985985    check_admin_referer( 'post_update', '_wpnonce_post_update' );
    986986
    987     if ( ! is_user_logged_in() )
     987    if ( ! is_user_logged_in() ) {
    988988        exit( '-1' );
    989 
    990     if ( empty( $_POST['content'] ) )
    991         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'Please enter some content to post.', 'buddypress' ) . '</p></div>' );
     989    }
     990
     991    if ( empty( $_POST['content'] ) ) {
     992        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . esc_html__( 'Please enter some content to post.', 'buddypress' ) . '</p></div>' );
     993    }
    992994
    993995    $activity_id = 0;
    … …  
    10251027
    10261028    if ( false === $activity_id ) {
    1027         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'There was a problem posting your update. Please try again.', 'buddypress' ) . '</p></div>' );
     1029        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . esc_html__( 'There was a problem posting your update. Please try again.', 'buddypress' ) . '</p></div>' );
    10281030    } elseif ( is_wp_error( $activity_id ) && $activity_id->get_error_code() ) {
    1029         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . $activity_id->get_error_message() . '</p></div>' );
     1031        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . esc_html( $activity_id->get_error_message() ) . '</p></div>' );
    10301032    }
    10311033
    … …  
    11461148    check_admin_referer( 'bp_activity_delete_link' );
    11471149
    1148     if ( ! is_user_logged_in() )
     1150    if ( ! is_user_logged_in() ) {
    11491151        exit( '-1' );
    1150 
    1151     if ( empty( $_POST['id'] ) || ! is_numeric( $_POST['id'] ) )
     1152    }
     1153
     1154    if ( empty( $_POST['id'] ) || ! is_numeric( $_POST['id'] ) ) {
    11521155        exit( '-1' );
     1156    }
    11531157
    11541158    $activity = new BP_Activity_Activity( (int) $_POST['id'] );
    11551159
    11561160    // Check access.
    1157     if ( ! bp_activity_user_can_delete( $activity ) )
     1161    if ( ! bp_activity_user_can_delete( $activity ) ) {
    11581162        exit( '-1' );
     1163    }
    11591164
    11601165    /** This action is documented in bp-activity/bp-activity-actions.php */
    11611166    do_action( 'bp_activity_before_action_delete_activity', $activity->id, $activity->user_id );
    11621167
    1163     if ( ! bp_activity_delete( array( 'id' => $activity->id, 'user_id' => $activity->user_id ) ) )
    1164         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>' );
     1168    if ( ! bp_activity_delete( array( 'id' => $activity->id, 'user_id' => $activity->user_id ) ) ) {
     1169        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . esc_html__( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>' );
     1170    }
    11651171
    11661172    /** This action is documented in bp-activity/bp-activity-actions.php */
    … …  
    11951201
    11961202    // Check access.
    1197     if ( ! bp_current_user_can( 'bp_moderate' ) && $comment->user_id != bp_loggedin_user_id() )
     1203    if ( ! bp_current_user_can( 'bp_moderate' ) && $comment->user_id != bp_loggedin_user_id() ) {
    11981204        exit( '-1' );
     1205    }
    11991206
    12001207    /** This action is documented in bp-activity/bp-activity-actions.php */
    12011208    do_action( 'bp_activity_before_action_delete_activity', $_POST['id'], $comment->user_id );
    12021209
    1203     if ( ! bp_activity_delete_comment( $comment->item_id, $comment->id ) )
    1204         exit( '-1<div id="message" class="error bp-ajax-message"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>' );
     1210    if ( ! bp_activity_delete_comment( $comment->item_id, $comment->id ) ) {
     1211        exit( '-1<div id="message" class="error bp-ajax-message"><p>' . esc_html__( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>' );
     1212    }
    12051213
    12061214    /** This action is documented in bp-activity/bp-activity-actions.php */
    … …  
    12241232
    12251233    // Check that user is logged in, Activity Streams are enabled, and Akismet is present.
    1226     if ( ! is_user_logged_in() || ! bp_is_active( 'activity' ) || empty( $bp->activity->akismet ) )
     1234    if ( ! is_user_logged_in() || ! bp_is_active( 'activity' ) || empty( $bp->activity->akismet ) ) {
    12271235        exit( '-1' );
     1236    }
    12281237
    12291238    // Check an item ID was passed.
    1230     if ( empty( $_POST['id'] ) || ! is_numeric( $_POST['id'] ) )
     1239    if ( empty( $_POST['id'] ) || ! is_numeric( $_POST['id'] ) ) {
    12311240        exit( '-1' );
     1241    }
    12321242
    12331243    // Is the current user allowed to spam items?
    1234     if ( ! bp_activity_user_can_mark_spam() )
     1244    if ( ! bp_activity_user_can_mark_spam() ) {
    12351245        exit( '-1' );
     1246    }
    12361247
    12371248    // Load up the activity item.
    12381249    $activity = new BP_Activity_Activity( (int) $_POST['id'] );
    1239     if ( empty( $activity->component ) )
     1250    if ( empty( $activity->component ) ) {
    12401251        exit( '-1' );
     1252    }
    12411253
    12421254    // Check nonce.
    … …  
    13461358    $activity = ! empty( $activity_array['activities'][0] ) ? $activity_array['activities'][0] : false;
    13471359
    1348     if ( empty( $activity ) )
     1360    if ( empty( $activity ) ) {
    13491361        exit; // @todo: error?
     1362    }
    13501363
    13511364    /**
    … …  
    13641377    $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $activity->content, &$activity ) );
    13651378
     1379    // phpcs:ignore WordPress.Security.EscapeOutput
    13661380    exit( $content );
    13671381}
    … …  
    13811395    check_ajax_referer( 'groups_invite_uninvite_user' );
    13821396
    1383     if ( ! $_POST['friend_id'] || ! $_POST['friend_action'] || ! $_POST['group_id'] )
    1384         return;
    1385 
    1386     if ( ! bp_groups_user_can_send_invites( $_POST['group_id'] ) )
    1387         return;
     1397    if ( ! $_POST['friend_id'] || ! $_POST['friend_action'] || ! $_POST['group_id'] ) {
     1398        return;
     1399    }
     1400
     1401    if ( ! bp_groups_user_can_send_invites( $_POST['group_id'] ) ) {
     1402        return;
     1403    }
    13881404
    13891405    $group_id = (int) $_POST['group_id'];
    … …  
    14241440        }
    14251441
     1442        // phpcs:disable WordPress.Security.EscapeOutput
    14261443        echo '<li id="uid-' . esc_attr( $user->id ) . '">';
    14271444        echo $user->avatar_thumb;
    … …  
    14291446        echo '<span class="activity">' . esc_attr( $user->last_active ) . '</span>';
    14301447        echo '<div class="action">
    1431                 <a class="button remove" href="' . wp_nonce_url( $uninvite_url, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
     1448                <a class="button remove" href="' . esc_url( wp_nonce_url( $uninvite_url, 'groups_invite_uninvite_user' ) ) . '" id="uid-' . esc_attr( $user->id ) . '">' . esc_html__( 'Remove Invite', 'buddypress' ) . '</a>
    14321449              </div>';
    14331450
    14341451        if ( 'is_pending' == $user_status ) {
    14351452            /* translators: %s: user link */
    1436             echo '<p class="description">' . sprintf( __( '%s has previously requested to join this group. Sending an invitation will automatically add the member to the group.', 'buddypress' ), $user->user_link ) . '</p>';
     1453            echo '<p class="description">' . sprintf( esc_html__( '%s has previously requested to join this group. Sending an invitation will automatically add the member to the group.', 'buddypress' ), $user->user_link ) . '</p>';
    14371454        }
    14381455
    14391456        echo '</li>';
     1457        // phpcs:enable
    14401458        exit;
    14411459
    … …  
    14761494    $user = get_user_by( 'id', $friend_id );
    14771495    if ( ! $user ) {
    1478         die( __( 'No member found by that ID.', 'buddypress' ) );
     1496        die( esc_html__( 'No member found by that ID.', 'buddypress' ) );
    14791497    }
    14801498
    … …  
    14841502
    14851503        if ( ! friends_remove_friend( bp_loggedin_user_id(), $friend_id ) ) {
    1486             echo __( 'Friendship could not be canceled.', 'buddypress' );
     1504            esc_html_e( 'Friendship could not be canceled.', 'buddypress' );
    14871505        } else {
    14881506            $url = bp_loggedin_user_url( bp_members_get_path_chunks( array( bp_get_friends_slug(), 'add-friend', array( $friend_id ) ) ) );
    1489             echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="friendship-button not_friends add" rel="add" href="' . wp_nonce_url( $url, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
     1507            echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="friendship-button not_friends add" rel="add" href="' . esc_url( wp_nonce_url( $url, 'friends_add_friend' ) ) . '">' . esc_html__( 'Add Friend', 'buddypress' ) . '</a>';
    14901508        }
    14911509
    … …  
    14951513
    14961514        if ( ! friends_add_friend( bp_loggedin_user_id(), $friend_id ) ) {
    1497             echo __(' Friendship could not be requested.', 'buddypress' );
     1515            esc_html_e(' Friendship could not be requested.', 'buddypress' );
    14981516        } else {
    14991517            $url = bp_loggedin_user_url( bp_members_get_path_chunks( array( bp_get_friends_slug(), 'requests', array( 'cancel', $friend_id ) ) ) );
    1500             echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="remove friendship-button pending_friend requested" rel="remove" href="' . wp_nonce_url( $url, 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
     1518            echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="remove friendship-button pending_friend requested" rel="remove" href="' . esc_url( wp_nonce_url( $url, 'friends_withdraw_friendship' ) ) . '" class="requested">' . esc_html__( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
    15011519        }
    15021520
    … …  
    15071525        if ( friends_withdraw_friendship( bp_loggedin_user_id(), $friend_id ) ) {
    15081526            $url = bp_loggedin_user_url( bp_members_get_path_chunks( array( bp_get_friends_slug(), 'add-friend', array( $friend_id ) ) ) );
    1509             echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="friendship-button not_friends add" rel="add" href="' . wp_nonce_url( $url, 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
     1527            echo '<a id="friend-' . esc_attr( $friend_id ) . '" class="friendship-button not_friends add" rel="add" href="' . esc_url( wp_nonce_url( $url, 'friends_add_friend' ) ) . '">' . esc_html__( 'Add Friend', 'buddypress' ) . '</a>';
    15101528        } else {
    1511             echo __("Friendship request could not be cancelled.", 'buddypress');
     1529            esc_html_e("Friendship request could not be cancelled.", 'buddypress');
    15121530        }
    15131531
    15141532    // Request already pending.
    15151533    } else {
    1516         echo __( 'Request Pending', 'buddypress' );
     1534        esc_html_e( 'Request Pending', 'buddypress' );
    15171535    }
    15181536
    … …  
    15351553
    15361554    if ( ! friends_accept_friendship( (int) $_POST['id'] ) )
    1537         echo "-1<div id='message' class='error'><p>" . __( 'There was a problem accepting that request. Please try again.', 'buddypress' ) . '</p></div>';
     1555        echo "-1<div id='message' class='error'><p>" . esc_html__( 'There was a problem accepting that request. Please try again.', 'buddypress' ) . '</p></div>';
    15381556
    15391557    exit;
    … …  
    15551573
    15561574    if ( ! friends_reject_friendship( (int) $_POST['id'] ) )
    1557         echo "-1<div id='message' class='error'><p>" . __( 'There was a problem rejecting that request. Please try again.', 'buddypress' ) . '</p></div>';
     1575        echo "-1<div id='message' class='error'><p>" . esc_html__( 'There was a problem rejecting that request. Please try again.', 'buddypress' ) . '</p></div>';
    15581576
    15591577    exit;
    … …  
    16101628
    16111629            if ( ! groups_join_group( $group->id ) ) {
    1612                 _e( 'Error joining group', 'buddypress' );
     1630                esc_html_e( 'Error joining group', 'buddypress' );
    16131631            } else {
    16141632                $leave_url = wp_nonce_url(
    … …  
    16191637                    'groups_leave_group'
    16201638                );
    1621                 echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
     1639                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . esc_html__( 'Leave Group', 'buddypress' ) . '</a>';
    16221640            }
    16231641        break;
    … …  
    16311649
    16321650            if ( ! groups_accept_invite( bp_loggedin_user_id(), $group->id ) ) {
    1633                 _e( 'Error requesting membership', 'buddypress' );
     1651                esc_html_e( 'Error requesting membership', 'buddypress' );
    16341652            } else {
    16351653                $leave_url = wp_nonce_url(
    … …  
    16401658                    'groups_leave_group'
    16411659                );
    1642                 echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
     1660                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button leave-group" rel="leave" href="' . esc_url( $leave_url ) . '">' . esc_html__( 'Leave Group', 'buddypress' ) . '</a>';
    16431661            }
    16441662        break;
    … …  
    16481666
    16491667            if ( ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
    1650                 _e( 'Error requesting membership', 'buddypress' );
     1668                esc_html_e( 'Error requesting membership', 'buddypress' );
    16511669            } else {
    1652                 echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button disabled pending membership-requested" rel="membership-requested" href="' . esc_url( bp_get_group_url( $group ) ) . '">' . __( 'Request Sent', 'buddypress' ) . '</a>';
     1670                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button disabled pending membership-requested" rel="membership-requested" href="' . esc_url( bp_get_group_url( $group ) ) . '">' . esc_html__( 'Request Sent', 'buddypress' ) . '</a>';
    16531671            }
    16541672        break;
    … …  
    16581676
    16591677            if ( ! groups_leave_group( $group->id ) ) {
    1660                 _e( 'Error leaving group', 'buddypress' );
     1678                esc_html_e( 'Error leaving group', 'buddypress' );
    16611679            } elseif ( 'public' === $group->status ) {
    16621680                $join_url = wp_nonce_url(
    … …  
    16671685                    'groups_join_group'
    16681686                );
    1669                 echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button join-group" rel="join" href="' . esc_url( $join_url ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
     1687                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button join-group" rel="join" href="' . esc_url( $join_url ) . '">' . esc_html__( 'Join Group', 'buddypress' ) . '</a>';
    16701688            } else {
    16711689                $request_url = wp_nonce_url(
    … …  
    16761694                    'groups_request_membership'
    16771695                );
    1678                 echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button request-membership" rel="join" href="' . esc_url( $request_url ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
     1696                echo '<a id="group-' . esc_attr( $group->id ) . '" class="group-button request-membership" rel="join" href="' . esc_url( $request_url ) . '">' . esc_html__( 'Request Membership', 'buddypress' ) . '</a>';
    16791697            }
    16801698        break;
    … …  
    16991717
    17001718    if ( ! $nonce_check || ! isset( $_POST['notice_id'] ) ) {
    1701         echo "-1<div id='message' class='error'><p>" . __( 'There was a problem closing the notice.', 'buddypress' ) . '</p></div>';
     1719        echo "-1<div id='message' class='error'><p>" . esc_html__( 'There was a problem closing the notice.', 'buddypress' ) . '</p></div>';
    17021720
    17031721    } else {
    … …  
    17261744    // Cannot respond to a thread you're not already a recipient on.
    17271745    if ( ! bp_current_user_can( 'bp_moderate' ) && ( ! messages_is_valid_thread( $thread_id ) || ! messages_check_thread_access( $thread_id ) ) ) {
    1728         echo "-1<div id='message' class='error'><p>" . __( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';
     1746        echo "-1<div id='message' class='error'><p>" . esc_html__( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';
    17291747        die;
    17301748    }
    … …  
    17321750    $result = messages_new_message( array( 'thread_id' => $thread_id, 'content' => $_REQUEST['content'] ) );
    17331751
    1734     if ( !empty( $result ) ) {
     1752    if ( ! empty( $result ) ) {
    17351753
    17361754        // Pretend we're in the message loop.
    … …  
    17661784
    17671785    } else {
    1768         echo "-1<div id='message' class='error'><p>" . __( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';
     1786        echo "-1<div id='message' class='error'><p>" . esc_html__( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';
    17691787    }
    17701788
    … …  
    20972115    if ( $message ) {
    20982116        // Surround the message with `<p>` tags.
    2099         echo wpautop( $message );
     2117        $message = wpautop( $message );
     2118
     2119        echo wp_kses(
     2120            $message,
     2121            array(
     2122                'p' => true,
     2123                'a' => array(
     2124                    'href' => true,
     2125                ),
     2126            )
     2127        );
    21002128    }
    21012129}
    … …  
    21142142    if ( $message ) {
    21152143        // Surround the message with `<p>` tags.
    2116         echo wpautop( $message );
     2144        $message = wpautop( $message );
     2145
     2146        echo wp_kses(
     2147            $message,
     2148            array(
     2149                'p' => true,
     2150                'a' => array(
     2151                    'href' => true,
     2152                ),
     2153            )
     2154        );
    21172155    }
    21182156}

  • trunk/src/bp-templates/bp-legacy/buddypress/activity/activity-loop.php

    r12082 r13822  
    3232
    3333        <li class="load-more">
    34             <a href="<?php bp_activity_load_more_link() ?>"><?php _e( 'Load More', 'buddypress' ); ?></a>
     34            <a href="<?php bp_activity_load_more_link() ?>"><?php esc_html_e( 'Load More', 'buddypress' ); ?></a>
    3535        </li>
    3636
    … …  
    4646
    4747    <div id="message" class="info">
    48         <p><?php _e( 'Sorry, there was no activity found. Please try a different filter.', 'buddypress' ); ?></p>
     48        <p><?php esc_html_e( 'Sorry, there was no activity found. Please try a different filter.', 'buddypress' ); ?></p>
    4949    </div>
    5050

  • trunk/src/bp-templates/bp-legacy/buddypress/activity/comment.php

    r12518 r13822  
    2727    <div class="acomment-meta">
    2828        <?php
    29         /* translators: 1: user profile link, 2: user name, 3: activity permalink, 4: ISO8601 timestamp, 5: activity relative timestamp */
    30         printf( __( '<a href="%1$s">%2$s</a> replied <a href="%3$s" class="activity-time-since"><span class="time-since" data-livestamp="%4$s">%5$s</span></a>', 'buddypress' ), bp_get_activity_comment_user_link(), bp_get_activity_comment_name(), bp_get_activity_comment_permalink(), bp_core_get_iso8601_date( bp_get_activity_comment_date_recorded() ), bp_get_activity_comment_date_recorded() );
     29            /* translators: 1: user profile link, 2: user name, 3: activity permalink, 4: ISO8601 timestamp, 5: activity relative timestamp */
     30            printf(
     31                esc_html__( '%1$s replied %2$s', 'buddypress' ),
     32                '<a href="' . esc_url( bp_get_activity_comment_user_link() ) . '">' . esc_html( bp_get_activity_comment_name() ) . '</a>',
     33                '<a href="' . esc_url( bp_get_activity_comment_permalink() ) . '" class="activity-time-since"><span class="time-since" data-livestamp="' . esc_attr( bp_core_get_iso8601_date( bp_get_activity_comment_date_recorded() ) ) . '">' . esc_html( bp_get_activity_comment_date_recorded() ). '</span></a>'
     34            );
    3135        ?>
    3236    </div>
    … …  
    3842        <?php if ( is_user_logged_in() && bp_activity_can_comment_reply( bp_activity_current_comment() ) ) : ?>
    3943
    40             <a href="#acomment-<?php bp_activity_comment_id(); ?>" class="acomment-reply bp-primary-action" id="acomment-reply-<?php bp_activity_id(); ?>-from-<?php bp_activity_comment_id(); ?>"><?php _e( 'Reply', 'buddypress' ); ?></a>
     44            <a href="#acomment-<?php bp_activity_comment_id(); ?>" class="acomment-reply bp-primary-action" id="acomment-reply-<?php bp_activity_id(); ?>-from-<?php bp_activity_comment_id(); ?>"><?php esc_html_e( 'Reply', 'buddypress' ); ?></a>
    4145
    4246        <?php endif; ?>
    … …  
    4448        <?php if ( bp_activity_user_can_delete() ) : ?>
    4549
    46             <a href="<?php bp_activity_comment_delete_link(); ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php _e( 'Delete', 'buddypress' ); ?></a>
     50            <a href="<?php bp_activity_comment_delete_link(); ?>" class="delete acomment-delete confirm bp-secondary-action" rel="nofollow"><?php esc_html_e( 'Delete', 'buddypress' ); ?></a>
    4751
    4852        <?php endif; ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/activity/entry.php

    r13520 r13822  
    5959            <?php if ( bp_get_activity_type() == 'activity_comment' ) : ?>
    6060
    61                 <a href="<?php bp_activity_thread_permalink(); ?>" class="button view bp-secondary-action"><?php _e( 'View Conversation', 'buddypress' ); ?></a>
     61                <a href="<?php bp_activity_thread_permalink(); ?>" class="button view bp-secondary-action"><?php esc_html_e( 'View Conversation', 'buddypress' ); ?></a>
    6262
    6363            <?php endif; ?>
    … …  
    7070                        <?php
    7171                        /* translators: %s: number of activity comments */
    72                         printf( __( 'Comment %s', 'buddypress' ), '<span>' . bp_activity_get_comment_count() . '</span>' );
     72                        printf( esc_html__( 'Comment %s', 'buddypress' ), '<span>' . esc_html( bp_activity_get_comment_count() ) . '</span>' );
    7373                        ?>
    7474                    </a>
    … …  
    8080                    <?php if ( !bp_get_activity_is_favorite() ) : ?>
    8181
    82                         <a href="<?php bp_activity_favorite_link(); ?>" class="button fav bp-secondary-action"><?php _e( 'Favorite', 'buddypress' ); ?></a>
     82                        <a href="<?php bp_activity_favorite_link(); ?>" class="button fav bp-secondary-action"><?php esc_html_e( 'Favorite', 'buddypress' ); ?></a>
    8383
    8484                    <?php else : ?>
    8585
    86                         <a href="<?php bp_activity_unfavorite_link(); ?>" class="button unfav bp-secondary-action"><?php _e( 'Remove Favorite', 'buddypress' ); ?></a>
     86                        <a href="<?php bp_activity_unfavorite_link(); ?>" class="button unfav bp-secondary-action"><?php esc_html_e( 'Remove Favorite', 'buddypress' ); ?></a>
    8787
    8888                    <?php endif; ?>
    … …  
    128128                    <div class="ac-reply-content">
    129129                        <div class="ac-textarea">
    130                             <label for="ac-input-<?php bp_activity_id(); ?>" class="bp-screen-reader-text"><?php
    131                                 /* translators: accessibility text */
    132                                 _e( 'Comment', 'buddypress' );
    133                             ?></label>
     130                            <label for="ac-input-<?php bp_activity_id(); ?>" class="bp-screen-reader-text">
     131                                <?php
     132                                    /* translators: accessibility text */
     133                                    esc_html_e( 'Comment', 'buddypress' );
     134                                ?>
     135                            </label>
    134136                            <textarea id="ac-input-<?php bp_activity_id(); ?>" class="ac-input bp-suggestions" name="ac_input_<?php bp_activity_id(); ?>"></textarea>
    135137                        </div>

  • trunk/src/bp-templates/bp-legacy/buddypress/activity/index.php

    r13442 r13822  
    6161                    <?php
    6262                    /* translators: %s: number of members */
    63                     printf( __( 'All Members %s', 'buddypress' ), '<span>' . bp_get_total_member_count() . '</span>' );
     63                    printf( esc_html__( 'All Members %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_member_count() ) . '</span>' );
    6464                    ?>
    6565                </a>
    … …  
    8585                                <?php
    8686                                /* translators: %s: number of friends */
    87                                 printf( esc_html__( 'My Friends %s', 'buddypress' ), '<span>' . bp_get_total_friend_count( bp_loggedin_user_id() ) . '</span>' );
     87                                printf( esc_html__( 'My Friends %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_friend_count( bp_loggedin_user_id() ) ) . '</span>' );
    8888                                ?>
    8989                            </a>
    … …  
    111111                                <?php
    112112                                /* translators: %s: current user groups count */
    113                                 printf( esc_html__( 'My Groups %s', 'buddypress' ), '<span>' . bp_get_total_group_count_for_user( bp_loggedin_user_id() ) . '</span>' );
     113                                printf( esc_html__( 'My Groups %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) . '</span>' );
    114114                                ?>
    115115                            </a>
    … …  
    135135                            <?php
    136136                            /* translators: %s: number of favorites */
    137                             printf( esc_html__( 'My Favorites %s', 'buddypress' ), '<span>' . bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) . '</span>' );
     137                            printf( esc_html__( 'My Favorites %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) . '</span>' );
    138138                            ?>
    139139                        </a>
    … …  
    162162                                        <?php
    163163                                        /* translators: %s: new mentions count */
    164                                         printf( esc_html( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) );
     164                                        printf( esc_html( _nx( '%s new', '%s new', bp_get_total_mention_count_for_user( bp_loggedin_user_id() ), 'Number of new activity mentions', 'buddypress' ), esc_html( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ) );
    165165                                        ?>
    166166                                    </span>
    … …  
    205205
    206206            <li id="activity-filter-select" class="last">
    207                 <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
     207                <label for="activity-filter-by"><?php esc_html_e( 'Show:', 'buddypress' ); ?></label>
    208208                <select id="activity-filter-by">
    209                     <option value="-1"><?php _e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
     209                    <option value="-1"><?php esc_html_e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
    210210
    211211                    <?php bp_activity_show_filters(); ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/activity/post-form.php

    r13442 r13822  
    3131        if ( bp_is_group() ) {
    3232            /* translators: 1: group name. 2: member name. */
    33             printf( __( 'What\'s new in %1$s, %2$s?', 'buddypress' ), bp_get_group_name(), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
     33            printf(
     34                esc_html__( 'What\'s new in %1$s, %2$s?', 'buddypress' ),
     35                esc_html( bp_get_group_name() ),
     36                esc_html( bp_get_user_firstname( bp_get_loggedin_user_fullname() ) )
     37            );
    3438        } else {
    3539            /* translators: %s: member name */
    36             printf( __( "What's new, %s?", 'buddypress' ), bp_get_user_firstname( bp_get_loggedin_user_fullname() ) );
     40            printf(
     41                esc_html__( "What's new, %s?", 'buddypress' ),
     42                esc_html( bp_get_user_firstname( bp_get_loggedin_user_fullname() ) )
     43            );
    3744        }
    3845        ?>
    … …  
    4148    <div id="whats-new-content">
    4249        <div id="whats-new-textarea">
    43             <label for="whats-new" class="bp-screen-reader-text"><?php
    44                 /* translators: accessibility text */
    45                 _e( 'Post what\'s new', 'buddypress' );
    46             ?></label>
     50            <label for="whats-new" class="bp-screen-reader-text">
     51                <?php
     52                    /* translators: accessibility text */
     53                    esc_html_e( 'Post what\'s new', 'buddypress' );
     54                ?>
     55            </label>
    4756            <textarea class="bp-suggestions" name="whats-new" id="whats-new" cols="50" rows="10"
    4857                <?php if ( bp_is_group() ) : ?>data-suggestions-group-id="<?php echo esc_attr( (int) bp_get_current_group_id() ); ?>" <?php endif; ?>
    … …  
    5968                <div id="whats-new-post-in-box">
    6069
    61                     <?php _e( 'Post in', 'buddypress' ); ?>:
     70                    <?php esc_html_e( 'Post in', 'buddypress' ); ?>:
    6271
    63                     <label for="whats-new-post-in" class="bp-screen-reader-text"><?php
    64                         /* translators: accessibility text */
    65                         _e( 'Post in', 'buddypress' );
    66                     ?></label>
     72                    <label for="whats-new-post-in" class="bp-screen-reader-text">
     73                        <?php
     74                            /* translators: accessibility text */
     75                            esc_html_e( 'Post in', 'buddypress' );
     76                        ?>
     77                    </label>
    6778                    <select id="whats-new-post-in" name="whats-new-post-in">
    68                         <option selected="selected" value="0"><?php _e( 'My Profile', 'buddypress' ); ?></option>
     79                        <option selected="selected" value="0"><?php esc_html_e( 'My Profile', 'buddypress' ); ?></option>
    6980
    7081                        <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100&populate_extras=0&update_meta_cache=0' ) ) :

  • trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php

    r13179 r13822  
    3838<script id="tmpl-bp-avatar-delete" type="text/html">
    3939    <# if ( 'user' === data.object ) { #>
    40         <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
     40        <p><?php esc_html_e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
    4141        <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
    4242    <# } else if ( 'group' === data.object ) { #>
    43         <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
     43        <p><?php esc_html_e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
    4444        <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></a></p>
    4545    <# } else { #>

  • trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/cover-images/index.php

    r12082 r13822  
    2525<script id="tmpl-bp-cover-image-delete" type="text/html">
    2626    <# if ( 'user' === data.object ) { #>
    27         <p><?php _e( "If you'd like to delete your current cover image but not upload a new one, please use the delete Cover Image button.", 'buddypress' ); ?></p>
     27        <p><?php esc_html_e( "If you'd like to delete your current cover image but not upload a new one, please use the delete Cover Image button.", 'buddypress' ); ?></p>
    2828        <p><a class="button edit" id="bp-delete-cover-image" href="#"><?php esc_html_e( 'Delete My Cover Image', 'buddypress' ); ?></a></p>
    2929    <# } else if ( 'group' === data.object ) { #>
    30         <p><?php _e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
     30        <p><?php esc_html_e( "If you'd like to remove the existing group cover image but not upload a new one, please use the delete group cover image button.", 'buddypress' ); ?></p>
    3131        <p><a class="button edit" id="bp-delete-cover-image" href="#"><?php esc_html_e( 'Delete Group Cover Image', 'buddypress' ); ?></a></p>
    3232    <# } else { #>

  • trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php

    r12082 r13822  
    2323                <div class="drag-drop-inside">
    2424                    <p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
    25                     <p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
     25                    <p><?php echo esc_html_x( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
    2626                    <p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
    2727                        /* translators: accessibility text */

  • trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php

    r13692 r13822  
    166166                        do_action( 'bp_before_email_header' );
    167167
    168                         echo bp_get_option( 'blogname' );
     168                        echo esc_html( bp_get_option( 'blogname' ) );
    169169
    170170                        /**
    … …  
    216216                        ?>
    217217
    218                         <span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
     218                        <span class="footer_text"><?php echo nl2br( esc_html( stripslashes( $settings['footer_text'] ) ) ); ?></span>
    219219                        <br><br>
    220                         <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
     220                        <a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php echo esc_html_x( 'unsubscribe', 'email', 'buddypress' ); ?></a>
    221221
    222222                        <?php

  • trunk/src/bp-templates/bp-legacy/buddypress/assets/embeds/header-activity.php

    r12082 r13822  
    2727                <?php endif; ?>
    2828
    29                 <span class="bp-embed-timestamp"><a href="<?php bp_activity_thread_permalink(); ?>"><?php echo date_i18n( get_option( 'time_format' ) . ' - ' . get_option( 'date_format' ), strtotime( bp_get_activity_date_recorded() ) ); ?></a></span>
     29                <span class="bp-embed-timestamp"><a href="<?php bp_activity_thread_permalink(); ?>"><?php echo esc_html( date_i18n( get_option( 'time_format' ) . ' - ' . get_option( 'date_format' ), strtotime( bp_get_activity_date_recorded() ) ) ); ?></a></span>
    3030            </p>
    3131        </div>

  • trunk/src/bp-templates/bp-legacy/buddypress/blogs/blogs-loop.php

    r12082 r13822  
    119119
    120120    <div id="message" class="info">
    121         <p><?php _e( 'Sorry, there were no sites found.', 'buddypress' ); ?></p>
     121        <p><?php esc_html_e( 'Sorry, there were no sites found.', 'buddypress' ); ?></p>
    122122    </div>
    123123

  • trunk/src/bp-templates/bp-legacy/buddypress/blogs/confirm.php

    r13530 r13822  
    3434                sprintf(
    3535                    /* translators: %s: the link of the new site */
    36                     __( '%s is your new site.', 'buddypress' ),
     36                    esc_html__( '%s is your new site.', 'buddypress' ),
    3737                    sprintf( '<a href="%s">%s</a>', esc_url( $args['blog_url'] ), esc_url( $args['blog_url'] ) )
    3838                ),
    3939                sprintf(
    40                     /* translators: 1: Login URL, 2: User name */
    41                     __( '<a href="%1$s">Log in</a> as "%2$s" using your existing password.', 'buddypress' ),
    42                     esc_url( $args['login_url'] ),
     40                    /* translators: 1: Login link, 2: User name */
     41                    esc_html__( '%1$s as "%2$s" using your existing password.', 'buddypress' ),
     42                    '<a href="' . esc_url( $args['login_url'] ) . '">' . esc_html__( 'Log in', 'buddypress' ) . '</a>',
    4343                    esc_html( $args['user_name'] )
    4444                )

  • trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php

    r13530 r13822  
    6565                        <?php
    6666                        /* translators: %s: all blogs count */
    67                         printf( __( 'All Sites %s', 'buddypress' ), '<span>' . bp_get_total_blog_count() . '</span>' ); ?>
     67                        printf( esc_html__( 'All Sites %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_blog_count() ) . '</span>' ); ?>
    6868                    </a>
    6969                </li>
    … …  
    7575                            <?php
    7676                            /* translators: %s: current user blogs count */
    77                             printf( __( 'My Sites %s', 'buddypress' ), '<span>' . bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) . '</span>' ); ?>
     77                            printf( esc_html__( 'My Sites %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) . '</span>' ); ?>
    7878                        </a>
    7979                    </li>
    … …  
    107107                <li id="blogs-order-select" class="last filter">
    108108
    109                     <label for="blogs-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
     109                    <label for="blogs-order-by"><?php esc_html_e( 'Order By:', 'buddypress' ); ?></label>
    110110                    <select id="blogs-order-by">
    111                         <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
    112                         <option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option>
    113                         <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
     111                        <option value="active"><?php esc_html_e( 'Last Active', 'buddypress' ); ?></option>
     112                        <option value="newest"><?php esc_html_e( 'Newest', 'buddypress' ); ?></option>
     113                        <option value="alphabetical"><?php esc_html_e( 'Alphabetical', 'buddypress' ); ?></option>
    114114
    115115                        <?php
    … …  
    127127        </div>
    128128
    129         <h2 class="bp-screen-reader-text"><?php
    130             /* translators: accessibility text */
    131             _e( 'Sites directory', 'buddypress' );
    132         ?></h2>
     129        <h2 class="bp-screen-reader-text">
     130            <?php
     131                /* translators: accessibility text */
     132                esc_html_e( 'Sites directory', 'buddypress' );
     133            ?>
     134        </h2>
    133135
    134136        <div id="blogs-dir-list" class="blogs dir-list">

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php

    r13156 r13822  
    5858            <?php if ( bp_is_group_creation_step( 'group-details' ) ) : ?>
    5959
    60                 <h2 class="bp-screen-reader-text"><?php
    61                     /* translators: accessibility text */
    62                     _e( 'Group Details', 'buddypress' );
    63                 ?></h2>
     60                <h2 class="bp-screen-reader-text">
     61                    <?php
     62                        /* translators: accessibility text */
     63                        esc_html_e( 'Group Details', 'buddypress' );
     64                    ?>
     65                </h2>
    6466
    6567                <?php
    … …  
    7375
    7476                <div>
    75                     <label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>
     77                    <label for="group-name"><?php esc_html_e( 'Group Name (required)', 'buddypress' ); ?></label>
    7678                    <input type="text" name="group-name" id="group-name" aria-required="true" value="<?php echo esc_attr( bp_get_new_group_name() ); ?>" />
    7779                </div>
    7880
    7981                <div>
    80                     <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
     82                    <label for="group-desc"><?php esc_html_e( 'Group Description (required)', 'buddypress' ); ?></label>
    8183                    <textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_new_group_description(); ?></textarea>
    8284                </div>
    … …  
    99101            <?php if ( bp_is_group_creation_step( 'group-settings' ) ) : ?>
    100102
    101                 <h2 class="bp-screen-reader-text"><?php
    102                     /* translators: accessibility text */
    103                     _e( 'Group Settings', 'buddypress' );
    104                 ?></h2>
     103                <h2 class="bp-screen-reader-text">
     104                    <?php
     105                        /* translators: accessibility text */
     106                        esc_html_e( 'Group Settings', 'buddypress' );
     107                    ?>
     108                </h2>
    105109
    106110                <?php
    … …  
    115119                <fieldset class="group-create-privacy">
    116120
    117                     <legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>
     121                    <legend><?php esc_html_e( 'Privacy Options', 'buddypress' ); ?></legend>
    118122
    119123                    <div class="radio">
    120124
    121                         <label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
     125                        <label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || ! bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php esc_html_e( 'This is a public group', 'buddypress' ); ?></label>
    122126
    123127                        <ul id="public-group-description">
    124                             <li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
    125                             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    126                             <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
     128                            <li><?php esc_html_e( 'Any site member can join this group.', 'buddypress' ); ?></li>
     129                            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     130                            <li><?php esc_html_e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
    127131                        </ul>
    128132
    129                         <label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
     133                        <label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php esc_html_e( 'This is a private group', 'buddypress' ); ?></label>
    130134
    131135                        <ul id="private-group-description">
    132                             <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
    133                             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    134                             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     136                            <li><?php esc_html_e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
     137                            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     138                            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    135139                        </ul>
    136140
    137                         <label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
     141                        <label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php esc_html_e('This is a hidden group', 'buddypress' ); ?></label>
    138142
    139143                        <ul id="hidden-group-description">
    140                             <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
    141                             <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
    142                             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     144                            <li><?php esc_html_e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
     145                            <li><?php esc_html_e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
     146                            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    143147                        </ul>
    144148
    … …  
    151155
    152156                    <fieldset class="group-create-types">
    153                         <legend><?php _e( 'Group Types', 'buddypress' ); ?></legend>
    154 
    155                         <p><?php _e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
     157                        <legend><?php esc_html_e( 'Group Types', 'buddypress' ); ?></legend>
     158
     159                        <p><?php esc_html_e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
    156160
    157161                        <?php foreach ( $group_types as $type ) : ?>
    158162                            <div class="checkbox">
    159                                 <label for="<?php printf( 'group-type-%s', $type->name ); ?>"><input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( true, ! empty( $type->create_screen_checked ) ); ?> /> <?php echo esc_html( $type->labels['name'] ); ?>
     163                                <label for="<?php printf( 'group-type-%s', esc_attr( $type->name ) ); ?>"><input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', esc_attr( $type->name ) ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( true, ! empty( $type->create_screen_checked ) ); ?> /> <?php echo esc_html( $type->labels['name'] ); ?>
    160164                                    <?php
    161165                                        if ( ! empty( $type->description ) ) {
    162166                                            /* translators: Group type description shown when creating a group. */
    163                                             printf( __( '&ndash; %s', 'buddypress' ), '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
     167                                            printf( esc_html__( '&ndash; %s', 'buddypress' ), '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
    164168                                        }
    165169                                    ?>
    … …  
    177181                    <fieldset class="group-create-invitations">
    178182
    179                         <legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>
    180 
    181                         <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
     183                        <legend><?php esc_html_e( 'Group Invitations', 'buddypress' ); ?></legend>
     184
     185                        <p><?php esc_html_e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
    182186
    183187                        <div class="radio">
    184188
    185                             <label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
    186 
    187                             <label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
    188 
    189                             <label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
     189                            <label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php esc_html_e( 'All group members', 'buddypress' ); ?></label>
     190
     191                            <label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php esc_html_e( 'Group admins and mods only', 'buddypress' ); ?></label>
     192
     193                            <label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php esc_html_e( 'Group admins only', 'buddypress' ); ?></label>
    190194
    191195                        </div>
    … …  
    211215            <?php if ( bp_is_group_creation_step( 'group-avatar' ) ) : ?>
    212216
    213                 <h2 class="bp-screen-reader-text"><?php
    214                     /* translators: accessibility text */
    215                     _e( 'Group Avatar', 'buddypress' );
    216                 ?></h2>
     217                <h2 class="bp-screen-reader-text">
     218                    <?php
     219                        /* translators: accessibility text */
     220                        esc_html_e( 'Group Avatar', 'buddypress' );
     221                    ?>
     222                </h2>
    217223
    218224                <?php
    … …  
    234240
    235241                    <div class="main-column">
    236                         <p><?php _e( "Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
     242                        <p><?php esc_html_e( "Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
    237243
    238244                        <p>
    239                             <label for="file" class="bp-screen-reader-text"><?php
    240                                 /* translators: accessibility text */
    241                                 _e( 'Select an image', 'buddypress' );
    242                             ?></label>
     245                            <label for="file" class="bp-screen-reader-text">
     246                                <?php
     247                                    /* translators: accessibility text */
     248                                    esc_html_e( 'Select an image', 'buddypress' );
     249                                ?>
     250                            </label>
    243251                            <input type="file" name="file" id="file" />
    244252                            <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
    … …  
    246254                        </p>
    247255
    248                         <p><?php _e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
     256                        <p><?php esc_html_e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
    249257                    </div><!-- .main-column -->
    250258
    … …  
    261269                <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    262270
    263                     <h4><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h4>
     271                    <h4><?php esc_html_e( 'Crop Group Profile Photo', 'buddypress' ); ?></h4>
    264272
    265273                    <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
    … …  
    296304            <?php if ( bp_is_group_creation_step( 'group-cover-image' ) ) : ?>
    297305
    298                 <h2 class="bp-screen-reader-text"><?php
    299                     /* translators: accessibility text */
    300                     _e( 'Cover Image', 'buddypress' );
    301                 ?></h2>
     306                <h2 class="bp-screen-reader-text">
     307                    <?php
     308                        /* translators: accessibility text */
     309                        esc_html_e( 'Cover Image', 'buddypress' );
     310                    ?>
     311                </h2>
    302312
    303313                <?php
    … …  
    312322                <div id="header-cover-image"></div>
    313323
    314                 <p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
     324                <p><?php esc_html_e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
    315325
    316326                <?php bp_attachments_get_template_part( 'cover-images/index' ); ?>
    … …  
    332342            <?php if ( bp_is_group_creation_step( 'group-invites' ) ) : ?>
    333343
    334                 <h2 class="bp-screen-reader-text"><?php
    335                     /* translators: accessibility text */
    336                     _e( 'Group Invites', 'buddypress' );
    337                 ?></h2>
     344                <h2 class="bp-screen-reader-text">
     345                    <?php
     346                        /* translators: accessibility text */
     347                        esc_html_e( 'Group Invites', 'buddypress' );
     348                    ?>
     349                </h2>
    338350
    339351                <?php
    … …  
    363375
    364376                        <div id="message" class="info">
    365                             <p><?php _e('Select people to invite from your friends list.', 'buddypress' ); ?></p>
     377                            <p><?php esc_html_e('Select people to invite from your friends list.', 'buddypress' ); ?></p>
    366378                        </div>
    367379
    … …  
    381393
    382394                                    <div class="action">
    383                                         <a class="remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a>
     395                                        <a class="remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php esc_html_e( 'Remove Invite', 'buddypress' ); ?></a>
    384396                                    </div>
    385397                                </li>
    … …  
    398410
    399411                    <div id="message" class="info">
    400                         <p><?php _e( 'Once you have built up friend connections you will be able to invite others to your group.', 'buddypress' ); ?></p>
     412                        <p><?php esc_html_e( 'Once you have built up friend connections you will be able to invite others to your group.', 'buddypress' ); ?></p>
    401413                    </div>
    402414

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php

    r13437 r13822  
    6969                        <?php
    7070                        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
    71                         printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
     71                        printf( esc_html__( 'Active %s', 'buddypress' ), esc_html( bp_get_group_last_active() ) );
    7272                        ?>
    7373                    </span>
    … …  
    141141
    142142    <div id="message" class="info">
    143         <p><?php _e( 'There were no groups found.', 'buddypress' ); ?></p>
     143        <p><?php esc_html_e( 'There were no groups found.', 'buddypress' ); ?></p>
    144144    </div>
    145145

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php

    r13442 r13822  
    6464                        <?php
    6565                        /* translators: %s: all groups count */
    66                         printf( __( 'All Groups %s', 'buddypress' ), '<span>' . bp_get_total_group_count() . '</span>' );
     66                        printf( esc_html__( 'All Groups %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_group_count() ) . '</span>' );
    6767                        ?>
    6868                    </a>
    … …  
    7474                            <?php
    7575                            /* translators: %s: current user groups count */
    76                             printf( __( 'My Groups %s', 'buddypress' ), '<span>' . bp_get_total_group_count_for_user( bp_loggedin_user_id() ) . '</span>' );
     76                            printf( esc_html__( 'My Groups %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) . '</span>' );
    7777                            ?>
    7878                        </a>
    … …  
    105105                <li id="groups-order-select" class="last filter">
    106106
    107                     <label for="groups-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
     107                    <label for="groups-order-by"><?php esc_html_e( 'Order By:', 'buddypress' ); ?></label>
    108108
    109109                    <select id="groups-order-by">
    110                         <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
    111                         <option value="popular"><?php _e( 'Most Members', 'buddypress' ); ?></option>
    112                         <option value="newest"><?php _e( 'Newly Created', 'buddypress' ); ?></option>
    113                         <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
     110                        <option value="active"><?php esc_html_e( 'Last Active', 'buddypress' ); ?></option>
     111                        <option value="popular"><?php esc_html_e( 'Most Members', 'buddypress' ); ?></option>
     112                        <option value="newest"><?php esc_html_e( 'Newly Created', 'buddypress' ); ?></option>
     113                        <option value="alphabetical"><?php esc_html_e( 'Alphabetical', 'buddypress' ); ?></option>
    114114
    115115                        <?php
    … …  
    126126        </div>
    127127
    128         <h2 class="bp-screen-reader-text"><?php
    129             /* translators: accessibility text */
    130             _e( 'Groups directory', 'buddypress' );
    131         ?></h2>
     128        <h2 class="bp-screen-reader-text">
     129            <?php
     130                /* translators: accessibility text */
     131                esc_html_e( 'Groups directory', 'buddypress' );
     132            ?>
     133        </h2>
    132134
    133135        <div id="groups-dir-list" class="groups dir-list">

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/activity.php

    r12907 r13822  
    1414            <li class="feed">
    1515                <a href="<?php bp_group_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>" aria-label="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>">
    16                     <?php _e( 'RSS', 'buddypress' ); ?>
     16                    <?php esc_html_e( 'RSS', 'buddypress' ); ?>
    1717                </a>
    1818            </li>
    … …  
    2929
    3030        <li id="activity-filter-select" class="last">
    31             <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
     31            <label for="activity-filter-by"><?php esc_html_e( 'Show:', 'buddypress' ); ?></label>
    3232            <select id="activity-filter-by">
    33                 <option value="-1"><?php _e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
     33                <option value="-1"><?php esc_html_e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
    3434
    3535                <?php bp_activity_show_filters( 'group' ); ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/delete-group.php

    r12082 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Delete Group', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Delete Group', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2222
    2323<div id="message" class="info">
    24     <p><?php _e( 'WARNING: Deleting this group will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
     24    <p><?php esc_html_e( 'WARNING: Deleting this group will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
    2525</div>
    2626
    27 <label for="delete-group-understand"><input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-group-button').disabled = ''; } else { document.getElementById('delete-group-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?></label>
     27<label for="delete-group-understand"><input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-group-button').disabled = ''; } else { document.getElementById('delete-group-button').disabled = 'disabled'; }" /> <?php esc_html_e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?></label>
    2828
    2929<?php

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/edit-details.php

    r12375 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Details', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Manage Group Details', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2121do_action( 'bp_before_group_details_admin' ); ?>
    2222
    23 <label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>
     23<label for="group-name"><?php esc_html_e( 'Group Name (required)', 'buddypress' ); ?></label>
    2424<input type="text" name="group-name" id="group-name" value="<?php echo esc_attr( bp_get_group_name() ); ?>" aria-required="true" />
    2525
    26 <label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
     26<label for="group-desc"><?php esc_html_e( 'Group Description (required)', 'buddypress' ); ?></label>
    2727<textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_group_description_editable(); ?></textarea>
    2828
    … …  
    3838<p>
    3939    <label for="group-notify-members">
    40         <input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php _e( 'Notify group members of these changes via email', 'buddypress' ); ?>
     40        <input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php esc_html_e( 'Notify group members of these changes via email', 'buddypress' ); ?>
    4141    </label>
    4242</p>

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-avatar.php

    r12082 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Group Avatar', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Group Avatar', 'buddypress' ); ?></h2>
    1313
    1414<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
    1515
    16     <p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
     16    <p><?php esc_html_e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
    1717
    1818    <p>
    19         <label for="file" class="bp-screen-reader-text"><?php
    20             /* translators: accessibility text */
    21             _e( 'Select an image', 'buddypress' );
    22         ?></label>
     19        <label for="file" class="bp-screen-reader-text">
     20            <?php
     21                /* translators: accessibility text */
     22                esc_html_e( 'Select an image', 'buddypress' );
     23            ?>
     24        </label>
    2325        <input type="file" name="file" id="file" />
    2426        <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
    … …  
    2830    <?php if ( bp_get_group_has_avatar() ) : ?>
    2931
    30         <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
     32        <p><?php esc_html_e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
    3133
    3234        <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_text' => __( 'Delete Group Profile Photo', 'buddypress' ) ) ); ?>
    … …  
    4850<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    4951
    50     <h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
     52    <h4><?php esc_html_e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
    5153
    5254    <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-cover-image.php

    r12082 r13822  
    1010?>
    1111
    12 <h2><?php _e( 'Cover Image', 'buddypress' ); ?></h2>
     12<h2><?php esc_html_e( 'Cover Image', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2121do_action( 'bp_before_group_settings_cover_image' ); ?>
    2222
    23 <p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
     23<p><?php esc_html_e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
    2424
    2525<?php bp_attachments_get_template_part( 'cover-images/index' ); ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-settings.php

    r13156 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Settings', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Manage Group Settings', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2323<fieldset class="group-create-privacy">
    2424
    25     <legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>
     25    <legend><?php esc_html_e( 'Privacy Options', 'buddypress' ); ?></legend>
    2626
    2727    <div class="radio">
    2828
    29         <label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
     29        <label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || ! bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php esc_html_e( 'This is a public group', 'buddypress' ); ?></label>
    3030
    3131        <ul id="public-group-description">
    32             <li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
    33             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    34             <li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
     32            <li><?php esc_html_e( 'Any site member can join this group.', 'buddypress' ); ?></li>
     33            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     34            <li><?php esc_html_e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
    3535        </ul>
    3636
    37         <label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
     37        <label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php esc_html_e( 'This is a private group', 'buddypress' ); ?></label>
    3838
    3939        <ul id="private-group-description">
    40             <li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
    41             <li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
    42             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     40            <li><?php esc_html_e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
     41            <li><?php esc_html_e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
     42            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    4343        </ul>
    4444
    45         <label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
     45        <label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php esc_html_e('This is a hidden group', 'buddypress' ); ?></label>
    4646
    4747        <ul id="hidden-group-description">
    48             <li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
    49             <li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
    50             <li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
     48            <li><?php esc_html_e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
     49            <li><?php esc_html_e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
     50            <li><?php esc_html_e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
    5151        </ul>
    5252
    … …  
    5959
    6060    <fieldset class="group-create-types">
    61         <legend><?php _e( 'Group Types', 'buddypress' ); ?></legend>
     61        <legend><?php esc_html_e( 'Group Types', 'buddypress' ); ?></legend>
    6262
    63         <p><?php _e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
     63        <p><?php esc_html_e( 'Select the types this group should be a part of.', 'buddypress' ); ?></p>
    6464
    6565        <?php foreach ( $group_types as $type ) : ?>
    6666            <div class="checkbox">
    67                 <label for="<?php printf( 'group-type-%s', $type->name ); ?>">
    68                     <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', $type->name ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
     67                <label for="<?php printf( 'group-type-%s', esc_attr( $type->name ) ); ?>">
     68                    <input type="checkbox" name="group-types[]" id="<?php printf( 'group-type-%s', esc_attr( $type->name ) ); ?>" value="<?php echo esc_attr( $type->name ); ?>" <?php checked( bp_groups_has_group_type( bp_get_current_group_id(), $type->name ) ); ?>/> <?php echo esc_html( $type->labels['name'] ); ?>
    6969                    <?php
    7070                        if ( ! empty( $type->description ) ) {
    71                             printf( __( '&ndash; %s', 'buddypress' ), '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
     71                            printf( esc_html__( '&ndash; %s', 'buddypress' ), '<span class="bp-group-type-desc">' . esc_html( $type->description ) . '</span>' );
    7272                        }
    7373                    ?>
    … …  
    8686    <fieldset class="group-create-invitations">
    8787
    88         <legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>
     88        <legend><?php esc_html_e( 'Group Invitations', 'buddypress' ); ?></legend>
    8989
    90         <p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
     90        <p><?php esc_html_e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
    9191
    9292        <div class="radio">
    9393
    94             <label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
     94            <label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php esc_html_e( 'All group members', 'buddypress' ); ?></label>
    9595
    96             <label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
     96            <label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php esc_html_e( 'Group admins and mods only', 'buddypress' ); ?></label>
    9797
    98             <label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
     98            <label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php esc_html_e( 'Group admins only', 'buddypress' ); ?></label>
    9999
    100100        </div>

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/manage-members.php

    r12082 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Manage Members', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Manage Members', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2424
    2525    <div class="bp-widget group-members-list group-admins-list">
    26         <h3 class="section-header"><?php _e( 'Administrators', 'buddypress' ); ?></h3>
     26        <h3 class="section-header"><?php esc_html_e( 'Administrators', 'buddypress' ); ?></h3>
    2727
    2828        <?php if ( bp_group_has_members( array( 'per_page' => 15, 'group_role' => array( 'admin' ), 'page_arg' => 'mlpage-admin' ) ) ) : ?>
    … …  
    7373                        <div class="action">
    7474                            <?php if ( count( bp_group_admin_ids( false, 'array' ) ) > 1 ) : ?>
    75                                 <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link(); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
     75                                <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link(); ?>"><?php esc_html_e( 'Demote to Member', 'buddypress' ); ?></a>
    7676                            <?php endif; ?>
    7777
    … …  
    110110
    111111        <div id="message" class="info">
    112             <p><?php _e( 'No group administrators were found.', 'buddypress' ); ?></p>
     112            <p><?php esc_html_e( 'No group administrators were found.', 'buddypress' ); ?></p>
    113113        </div>
    114114
    … …  
    117117
    118118    <div class="bp-widget group-members-list group-mods-list">
    119         <h3 class="section-header"><?php _e( 'Moderators', 'buddypress' ); ?></h3>
     119        <h3 class="section-header"><?php esc_html_e( 'Moderators', 'buddypress' ); ?></h3>
    120120
    121121        <?php if ( bp_group_has_members( array( 'per_page' => 15, 'group_role' => array( 'mod' ), 'page_arg' => 'mlpage-mod' ) ) ) : ?>
    … …  
    166166
    167167                        <div class="action">
    168                             <a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
    169                             <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link(); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
     168                            <a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm mod-promote-to-admin"><?php esc_html_e( 'Promote to Admin', 'buddypress' ); ?></a>
     169                            <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link(); ?>"><?php esc_html_e( 'Demote to Member', 'buddypress' ); ?></a>
    170170
    171171                            <?php
    … …  
    205205
    206206            <div id="message" class="info">
    207                 <p><?php _e( 'No group moderators were found.', 'buddypress' ); ?></p>
     207                <p><?php esc_html_e( 'No group moderators were found.', 'buddypress' ); ?></p>
    208208            </div>
    209209
    … …  
    212212
    213213    <div class="bp-widget group-members-list">
    214         <h3 class="section-header"><?php _e( "Members", 'buddypress' ); ?></h3>
     214        <h3 class="section-header"><?php esc_html_e( "Members", 'buddypress' ); ?></h3>
    215215
    216216        <?php if ( bp_group_has_members( array( 'per_page' => 15, 'exclude_banned' => 0 ) ) ) : ?>
    … …  
    246246                                if ( bp_get_group_member_is_banned() ) {
    247247                                    echo ' <span class="banned">';
    248                                     _e( '(banned)', 'buddypress' );
     248                                    esc_html_e( '(banned)', 'buddypress' );
    249249                                    echo '</span>';
    250250                                } ?>
    … …  
    269269                            <?php if ( bp_get_group_member_is_banned() ) : ?>
    270270
    271                                 <a href="<?php bp_group_member_unban_link(); ?>" class="button confirm member-unban"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>
     271                                <a href="<?php bp_group_member_unban_link(); ?>" class="button confirm member-unban"><?php esc_html_e( 'Remove Ban', 'buddypress' ); ?></a>
    272272
    273273                            <?php else : ?>
    274274
    275                                 <a href="<?php bp_group_member_ban_link(); ?>" class="button confirm member-ban"><?php _e( 'Kick &amp; Ban', 'buddypress' ); ?></a>
    276                                 <a href="<?php bp_group_member_promote_mod_link(); ?>" class="button confirm member-promote-to-mod"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a>
    277                                 <a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm member-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
     275                                <a href="<?php bp_group_member_ban_link(); ?>" class="button confirm member-ban"><?php esc_html_e( 'Kick &amp; Ban', 'buddypress' ); ?></a>
     276                                <a href="<?php bp_group_member_promote_mod_link(); ?>" class="button confirm member-promote-to-mod"><?php esc_html_e( 'Promote to Mod', 'buddypress' ); ?></a>
     277                                <a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm member-promote-to-admin"><?php esc_html_e( 'Promote to Admin', 'buddypress' ); ?></a>
    278278
    279279                            <?php endif; ?>
    280280
    281                             <a href="<?php bp_group_member_remove_link(); ?>" class="button confirm"><?php _e( 'Remove from group', 'buddypress' ); ?></a>
     281                            <a href="<?php bp_group_member_remove_link(); ?>" class="button confirm"><?php esc_html_e( 'Remove from group', 'buddypress' ); ?></a>
    282282
    283283                            <?php
    … …  
    316316
    317317            <div id="message" class="info">
    318                 <p><?php _e( 'No group members were found.', 'buddypress' ); ?></p>
     318                <p><?php esc_html_e( 'No group members were found.', 'buddypress' ); ?></p>
    319319            </div>
    320320

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin/membership-requests.php

    r12082 r13822  
    1010?>
    1111
    12 <h2 class="bp-screen-reader-text"><?php _e( 'Manage Membership Requests', 'buddypress' ); ?></h2>
     12<h2 class="bp-screen-reader-text"><?php esc_html_e( 'Manage Membership Requests', 'buddypress' ); ?></h2>
    1313
    1414<?php

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php

    r13437 r13822  
    6464                    <?php
    6565                    /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
    66                     printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
     66                    printf( esc_html__( 'Active %s', 'buddypress' ), esc_html( bp_get_group_last_active() ) );
    6767                    ?>
    6868                </span>
    … …  
    7878            <?php if ( bp_group_is_visible() ) : ?>
    7979
    80                 <h2><?php _e( 'Group Admins', 'buddypress' ); ?></h2>
     80                <h2><?php esc_html_e( 'Group Admins', 'buddypress' ); ?></h2>
    8181
    8282                <?php bp_group_list_admins();
    … …  
    9898                    do_action( 'bp_before_group_menu_mods' ); ?>
    9999
    100                     <h2><?php _e( 'Group Mods' , 'buddypress' ); ?></h2>
     100                    <h2><?php esc_html_e( 'Group Mods' , 'buddypress' ); ?></h2>
    101101
    102102                    <?php bp_group_list_mods();

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/group-header.php

    r13437 r13822  
    2121    <?php if ( bp_group_is_visible() ) : ?>
    2222
    23         <h2><?php _e( 'Group Admins', 'buddypress' ); ?></h2>
     23        <h2><?php esc_html_e( 'Group Admins', 'buddypress' ); ?></h2>
    2424
    2525        <?php bp_group_list_admins();
    … …  
    4141            do_action( 'bp_before_group_menu_mods' ); ?>
    4242
    43             <h2><?php _e( 'Group Mods' , 'buddypress' ); ?></h2>
     43            <h2><?php esc_html_e( 'Group Mods' , 'buddypress' ); ?></h2>
    4444
    4545            <?php bp_group_list_mods();
    … …  
    7373        <?php
    7474        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
    75         printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
     75        printf( esc_html__( 'Active %s', 'buddypress' ), esc_html( bp_get_group_last_active() ) );
    7676        ?>
    7777    </span>

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php

    r12082 r13822  
    7373
    7474                <div class="action">
    75                     <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php _e( 'Remove Invite', 'buddypress' ); ?></a>
     75                    <a class="button remove" href="<?php bp_group_invite_user_remove_invite_url(); ?>" id="<?php bp_group_invite_item_id(); ?>"><?php esc_html_e( 'Remove Invite', 'buddypress' ); ?></a>
    7676
    7777                    <?php
    … …  
    109109
    110110        <div id="message" class="info">
    111             <p><?php _e( 'Select friends to invite.', 'buddypress' ); ?></p>
     111            <p><?php esc_html_e( 'Select friends to invite.', 'buddypress' ); ?></p>
    112112        </div>
    113113

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/members.php

    r12082 r13822  
    130130
    131131    <div id="message" class="info">
    132         <p><?php _e( 'No members were found.', 'buddypress' ); ?></p>
     132        <p><?php esc_html_e( 'No members were found.', 'buddypress' ); ?></p>
    133133    </div>
    134134

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/requests-loop.php

    r12082 r13822  
    9494
    9595        <div id="message" class="info">
    96             <p><?php _e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
     96            <p><?php esc_html_e( 'There are no pending membership requests.', 'buddypress' ); ?></p>
    9797        </div>
    9898

  • trunk/src/bp-templates/bp-legacy/buddypress/groups/single/send-invites.php

    r13156 r13822  
    2323elseif ( bp_get_new_group_invite_friend_list() ) : ?>
    2424
    25     <h2 class="bp-screen-reader-text"><?php _e( 'Send invites', 'buddypress' ); ?></h2>
     25    <h2 class="bp-screen-reader-text"><?php esc_html_e( 'Send invites', 'buddypress' ); ?></h2>
    2626
    2727    <?php /* 'send-invite-form' is important for AJAX support */ ?>
    … …  
    4848
    4949    <div id="message" class="info">
    50         <p class="notice"><?php _e( 'Group invitations can only be extended to friends.', 'buddypress' ); ?></p>
    51         <p class="message-body"><?php _e( "Once you've made some friendships, you'll be able to invite those members to this group.", 'buddypress' ); ?></p>
     50        <p class="notice"><?php esc_html_e( 'Group invitations can only be extended to friends.', 'buddypress' ); ?></p>
     51        <p class="message-body"><?php esc_html_e( "Once you've made some friendships, you'll be able to invite those members to this group.", 'buddypress' ); ?></p>
    5252    </div>
    5353
    … …  
    5757
    5858    <div id="message" class="info">
    59         <p class="notice"><?php _e( 'All of your friends already belong to this group.', 'buddypress' ); ?></p>
     59        <p class="notice"><?php esc_html_e( 'All of your friends already belong to this group.', 'buddypress' ); ?></p>
    6060    </div>
    6161

  • trunk/src/bp-templates/bp-legacy/buddypress/members/activate.php

    r13436 r13822  
    4343
    4444            <?php if ( isset( $_GET['e'] ) ) : ?>
    45                 <p><?php _e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
     45                <p><?php esc_html_e( 'Your account was activated successfully! Your account details have been sent to you in a separate email.', 'buddypress' ); ?></p>
    4646            <?php else : ?>
    4747                <p>
    4848                    <?php
    4949                    /* translators: %s: login url */
    50                     printf( __( 'Your account was activated successfully! You can now <a href="%s">log in</a> with the username and password you provided when you signed up.', 'buddypress' ), wp_login_url( bp_get_root_url() ) );
     50                    printf(
     51                        esc_html__( 'Your account was activated successfully! You can now %s with the username and password you provided when you signed up.', 'buddypress' ),
     52                        '<a href="'. esc_url( wp_login_url( bp_get_root_url() ) ) . '">' . esc_html__( 'log in', 'buddypress' ) . '</a>'
     53                    );
    5154                    ?>
    5255                </p>
    … …  
    5558        <?php else : ?>
    5659
    57             <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
     60            <p><?php esc_html_e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
    5861
    5962            <form action="" method="post" class="standard-form" id="activation-form">
    6063
    61                 <label for="key"><?php _e( 'Activation Key:', 'buddypress' ); ?></label>
     64                <label for="key"><?php esc_html_e( 'Activation Key:', 'buddypress' ); ?></label>
    6265                <input type="text" name="key" id="key" value="<?php echo esc_attr( bp_get_current_activation_key() ); ?>" />
    6366

  • trunk/src/bp-templates/bp-legacy/buddypress/members/index.php

    r13442 r13822  
    6060        <div class="item-list-tabs" aria-label="<?php esc_attr_e( 'Members directory main navigation', 'buddypress' ); ?>" role="navigation">
    6161            <ul>
    62                 <li class="selected" id="members-all"><a href="<?php bp_members_directory_permalink(); ?>"><?php printf( __( 'All Members %s', 'buddypress' ), '<span>' . bp_get_total_member_count() . '</span>' ); ?></a></li>
     62                <li class="selected" id="members-all"><a href="<?php bp_members_directory_permalink(); ?>"><?php printf( esc_html__( 'All Members %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_member_count() ) . '</span>' ); ?></a></li>
    6363
    6464                <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    65                     <li id="members-personal"><a href="<?php bp_loggedin_user_link( array( bp_get_friends_slug(), 'my-friends' ) ); ?>"><?php printf( __( 'My Friends %s', 'buddypress' ), '<span>' . bp_get_total_friend_count( bp_loggedin_user_id() ) . '</span>' ); ?></a></li>
     65                    <li id="members-personal"><a href="<?php bp_loggedin_user_link( array( bp_get_friends_slug(), 'my-friends' ) ); ?>"><?php printf( esc_html__( 'My Friends %s', 'buddypress' ), '<span>' . esc_html( bp_get_total_friend_count( bp_loggedin_user_id() ) ) . '</span>' ); ?></a></li>
    6666                <?php endif; ?>
    6767
    … …  
    9090
    9191                <li id="members-order-select" class="last filter">
    92                     <label for="members-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
     92                    <label for="members-order-by"><?php esc_html_e( 'Order By:', 'buddypress' ); ?></label>
    9393                    <select id="members-order-by">
    94                         <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
    95                         <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option>
     94                        <option value="active"><?php esc_html_e( 'Last Active', 'buddypress' ); ?></option>
     95                        <option value="newest"><?php esc_html_e( 'Newest Registered', 'buddypress' ); ?></option>
    9696
    9797                        <?php if ( bp_is_active( 'xprofile' ) ) : ?>
    98                             <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
     98                            <option value="alphabetical"><?php esc_html_e( 'Alphabetical', 'buddypress' ); ?></option>
    9999                        <?php endif; ?>
    100100
    … …  
    112112        </div>
    113113
    114         <h2 class="bp-screen-reader-text"><?php
    115             /* translators: accessibility text */
    116             _e( 'Members directory', 'buddypress' );
    117         ?></h2>
     114        <h2 class="bp-screen-reader-text">
     115            <?php
     116                /* translators: accessibility text */
     117                esc_html_e( 'Members directory', 'buddypress' );
     118            ?>
     119        </h2>
    118120
    119121        <div id="members-dir-list" class="members dir-list">

  • trunk/src/bp-templates/bp-legacy/buddypress/members/members-loop.php

    r12082 r13822  
    141141
    142142    <div id="message" class="info">
    143         <p><?php _e( "Sorry, no members were found.", 'buddypress' ); ?></p>
     143        <p><?php esc_html_e( "Sorry, no members were found.", 'buddypress' ); ?></p>
    144144    </div>
    145145

  • trunk/src/bp-templates/bp-legacy/buddypress/members/register.php

    r13170 r13822  
    4444            do_action( 'bp_before_registration_disabled' ); ?>
    4545
    46                 <p><?php _e( 'User registration is currently not allowed.', 'buddypress' ); ?></p>
     46                <p><?php esc_html_e( 'User registration is currently not allowed.', 'buddypress' ); ?></p>
    4747
    4848            <?php
    … …  
    6666            </div>
    6767
    68             <p><?php _e( 'Registering for this site is easy. Just fill in the fields below, and we\'ll get a new account set up for you in no time.', 'buddypress' ); ?></p>
     68            <p><?php esc_html_e( 'Registering for this site is easy. Just fill in the fields below, and we\'ll get a new account set up for you in no time.', 'buddypress' ); ?></p>
    6969
    7070            <?php
    … …  
    8181                <?php /***** Basic Account Details ******/ ?>
    8282
    83                 <h2><?php _e( 'Account Details', 'buddypress' ); ?></h2>
    84 
    85                 <label for="signup_username"><?php _e( 'Username', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     83                <h2><?php esc_html_e( 'Account Details', 'buddypress' ); ?></h2>
     84
     85                <label for="signup_username"><?php esc_html_e( 'Username', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    8686                <?php
    8787
    … …  
    9494                <input type="text" name="signup_username" id="signup_username" value="<?php bp_signup_username_value(); ?>" <?php bp_form_field_attributes( 'username' ); ?>/>
    9595
    96                 <label for="signup_email"><?php _e( 'Email Address', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     96                <label for="signup_email"><?php esc_html_e( 'Email Address', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    9797                <?php
    9898
    … …  
    105105                <input type="email" name="signup_email" id="signup_email" value="<?php bp_signup_email_value(); ?>" <?php bp_form_field_attributes( 'email' ); ?>/>
    106106
    107                 <label for="signup_password"><?php _e( 'Choose a Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     107                <label for="signup_password"><?php esc_html_e( 'Choose a Password', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    108108                <?php
    109109
    … …  
    117117                <div id="pass-strength-result"></div>
    118118
    119                 <label for="signup_password_confirm"><?php _e( 'Confirm Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     119                <label for="signup_password_confirm"><?php esc_html_e( 'Confirm Password', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    120120                <?php
    121121
    … …  
    163163                <div class="register-section" id="profile-details-section">
    164164
    165                     <h2><?php _e( 'Profile Details', 'buddypress' ); ?></h2>
     165                    <h2><?php esc_html_e( 'Profile Details', 'buddypress' ); ?></h2>
    166166
    167167                    <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
    … …  
    189189                                    printf(
    190190                                        /* translators: %s: level of visibility */
    191                                         __( 'This field can be seen by: %s', 'buddypress' ),
    192                                         '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
     191                                        esc_html__( 'This field can be seen by: %s', 'buddypress' ),
     192                                        '<span class="current-visibility-level">' . esc_html( bp_get_the_profile_field_visibility_level_label() ) . '</span>'
    193193                                    );
    194194                                    ?>
    195195                                    </span>
    196                                     <button type="button" class="visibility-toggle-link" aria-describedby="<?php bp_the_profile_field_input_name(); ?>-2" aria-expanded="false"><?php _ex( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></button>
     196                                    <button type="button" class="visibility-toggle-link" aria-describedby="<?php bp_the_profile_field_input_name(); ?>-2" aria-expanded="false"><?php echo esc_html_x( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></button>
    197197                                </p>
    198198
    199199                                <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id() ?>">
    200200                                    <fieldset>
    201                                         <legend><?php _e( 'Who can see this field?', 'buddypress' ) ?></legend>
     201                                        <legend><?php esc_html_e( 'Who can see this field?', 'buddypress' ) ?></legend>
    202202
    203203                                        <?php bp_profile_visibility_radio_buttons() ?>
    204204
    205205                                    </fieldset>
    206                                     <button type="button" class="field-visibility-settings-close"><?php _e( 'Close', 'buddypress' ) ?></button>
     206                                    <button type="button" class="field-visibility-settings-close"><?php esc_html_e( 'Close', 'buddypress' ) ?></button>
    207207
    208208                                </div>
    … …  
    211211                                    <?php
    212212                                    printf(
    213                                         __( 'This field can be seen by: %s', 'buddypress' ),
    214                                         '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
     213                                        esc_html__( 'This field can be seen by: %s', 'buddypress' ),
     214                                        '<span class="current-visibility-level">' . esc_html( bp_get_the_profile_field_visibility_level_label() ) . '</span>'
    215215                                    );
    216216                                    ?>
    … …  
    273273                <div class="register-section" id="blog-details-section">
    274274
    275                     <h2><?php _e( 'Blog Details', 'buddypress' ); ?></h2>
    276 
    277                     <p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'buddypress' ); ?></label></p>
     275                    <h2><?php esc_html_e( 'Blog Details', 'buddypress' ); ?></h2>
     276
     277                    <p><label for="signup_with_blog"><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php esc_html_e( 'Yes, I\'d like to create a new site', 'buddypress' ); ?></label></p>
    278278
    279279                    <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
    280280
    281                         <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     281                        <label for="signup_blog_url"><?php esc_html_e( 'Blog URL', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    282282                        <?php
    283283
    … …  
    292292                            http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" /> .<?php bp_signup_subdomain_base(); ?>
    293293                        <?php else : ?>
    294                             <?php echo home_url( '/' ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />
     294                            <?php echo esc_url( home_url( '/' ) ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />
    295295                        <?php endif; ?>
    296296
    297                         <label for="signup_blog_title"><?php _e( 'Site Title', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
     297                        <label for="signup_blog_title"><?php esc_html_e( 'Site Title', 'buddypress' ); ?> <?php esc_html_e( '(required)', 'buddypress' ); ?></label>
    298298                        <?php
    299299
    … …  
    307307
    308308                        <fieldset class="register-site">
    309                             <legend class="label"><?php _e( 'Privacy: I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?></legend>
     309                            <legend class="label"><?php esc_html_e( 'Privacy: I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?></legend>
    310310                            <?php
    311311
    … …  
    317317                            do_action( 'bp_signup_blog_privacy_errors' ); ?>
    318318
    319                             <label for="signup_blog_privacy_public"><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes', 'buddypress' ); ?></label>
    320                             <label for="signup_blog_privacy_private"><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'No', 'buddypress' ); ?></label>
     319                            <label for="signup_blog_privacy_public"><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php esc_html_e( 'Yes', 'buddypress' ); ?></label>
     320                            <label for="signup_blog_privacy_private"><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_private" value="private"<?php if ( 'private' == bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php esc_html_e( 'No', 'buddypress' ); ?></label>
    321321                        </fieldset>
    322322
    … …  
    399399            <div id="template-notices" role="alert" aria-atomic="true">
    400400                <?php if ( bp_get_membership_requests_required() ) : ?>
    401                     <p><?php _e( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' ); ?></p>
     401                    <p><?php esc_html_e( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' ); ?></p>
    402402                <?php elseif ( bp_registration_needs_activation() ) : ?>
    403                     <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p>
     403                    <p><?php esc_html_e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p>
    404404                <?php else : ?>
    405                     <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ); ?></p>
     405                    <p><?php esc_html_e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ); ?></p>
    406406                <?php endif; ?>
    407407            </div>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/activity.php

    r12082 r13822  
    1616
    1717        <li id="activity-filter-select" class="last">
    18             <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
     18            <label for="activity-filter-by"><?php esc_html_e( 'Show:', 'buddypress' ); ?></label>
    1919            <select id="activity-filter-by">
    20                 <option value="-1"><?php _e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
     20                <option value="-1"><?php esc_html_e( '&mdash; Everything &mdash;', 'buddypress' ); ?></option>
    2121
    2222                <?php bp_activity_show_filters(); ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/blogs.php

    r12082 r13822  
    1717        <li id="blogs-order-select" class="last filter">
    1818
    19             <label for="blogs-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
     19            <label for="blogs-order-by"><?php esc_html_e( 'Order By:', 'buddypress' ); ?></label>
    2020            <select id="blogs-order-by">
    21                 <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
    22                 <option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option>
    23                 <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
     21                <option value="active"><?php esc_html_e( 'Last Active', 'buddypress' ); ?></option>
     22                <option value="newest"><?php esc_html_e( 'Newest', 'buddypress' ); ?></option>
     23                <option value="alphabetical"><?php esc_html_e( 'Alphabetical', 'buddypress' ); ?></option>
    2424
    2525                <?php

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/friends.php

    r12082 r13822  
    1818            <li id="members-order-select" class="last filter">
    1919
    20                 <label for="members-friends"><?php _e( 'Order By:', 'buddypress' ); ?></label>
     20                <label for="members-friends"><?php esc_html_e( 'Order By:', 'buddypress' ); ?></label>
    2121                <select id="members-friends">
    22                     <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
    23                     <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ); ?></option>
    24                     <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
     22                    <option value="active"><?php esc_html_e( 'Last Active', 'buddypress' ); ?></option>
     23                    <option value="newest"><?php esc_html_e( 'Newest Registered', 'buddypress' ); ?></option>
     24                    <option value="alphabetical"><?php esc_html_e( 'Alphabetical', 'buddypress' ); ?></option>
    2525
    2626                    <?php
    … …  
    5555
    5656        <?php if (is_user_logged_in() ) : ?>
    57             <h2 class="bp-screen-reader-text"><?php
    58                 /* translators: accessibility text */
    59                 _e( 'My friends', 'buddypress' );
    60             ?></h2>
     57            <h2 class="bp-screen-reader-text">
     58                <?php
     59                    /* translators: accessibility text */
     60                    esc_html_e( 'My friends', 'buddypress' );
     61                ?>
     62            </h2>
    6163        <?php else : ?>
    62             <h2 class="bp-screen-reader-text"><?php
    63                 /* translators: accessibility text */
    64                 _e( 'Friends', 'buddypress' );
    65             ?></h2>
     64            <h2 class="bp-screen-reader-text">
     65                <?php
     66                    /* translators: accessibility text */
     67                    esc_html_e( 'Friends', 'buddypress' );
     68                ?>
     69            </h2>
    6670        <?php endif ?>
    6771

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/friends/requests.php

    r12082 r13822  
    1717<?php if ( bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() ) ) : ?>
    1818
    19     <h2 class="bp-screen-reader-text"><?php
    20         /* translators: accessibility text */
    21         _e( 'Friendship requests', 'buddypress' );
    22     ?></h2>
     19    <h2 class="bp-screen-reader-text">
     20        <?php
     21            /* translators: accessibility text */
     22            esc_html_e( 'Friendship requests', 'buddypress' );
     23        ?>
     24    </h2>
    2325
    2426    <div id="pag-top" class="pagination no-ajax">
    … …  
    6163
    6264                <div class="action">
    63                     <a class="button accept" href="<?php bp_friend_accept_request_link(); ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> &nbsp;
    64                     <a class="button reject" href="<?php bp_friend_reject_request_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
     65                    <a class="button accept" href="<?php bp_friend_accept_request_link(); ?>"><?php esc_html_e( 'Accept', 'buddypress' ); ?></a> &nbsp;
     66                    <a class="button reject" href="<?php bp_friend_reject_request_link(); ?>"><?php esc_html_e( 'Reject', 'buddypress' ); ?></a>
    6567
    6668                    <?php
    … …  
    106108
    107109    <div id="message" class="info">
    108         <p><?php _e( 'You have no pending friendship requests.', 'buddypress' ); ?></p>
     110        <p><?php esc_html_e( 'You have no pending friendship requests.', 'buddypress' ); ?></p>
    109111    </div>
    110112

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/groups/invites.php

    r13437 r13822  
    1717<?php if ( bp_has_groups( 'type=invites&user_id=' . bp_displayed_user_id() ) ) : ?>
    1818
    19     <h2 class="bp-screen-reader-text"><?php
    20         /* translators: accessibility text */
    21         esc_html_e( 'Group invitations', 'buddypress' );
    22     ?></h2>
     19    <h2 class="bp-screen-reader-text">
     20        <?php
     21            /* translators: accessibility text */
     22            esc_html_e( 'Group invitations', 'buddypress' );
     23        ?>
     24    </h2>
    2325
    2426    <ul id="group-list" class="invites item-list">
    … …  
    3840                        &nbsp;-&nbsp;
    3941                        <?php
    40                         /* translators: %s: group members count */
    41                         printf( _nx( '%d member', '%d members', bp_get_group_total_members( false ),'Group member count', 'buddypress' ), bp_get_group_total_members( false )  );
     42                        echo esc_html(
     43                            sprintf(
     44                                /* translators: %s: group members count */
     45                                _nx( '%d member', '%d members', bp_get_group_total_members( false ), 'Group member count', 'buddypress' ),
     46                                esc_html( bp_get_group_total_members( false ) )
     47                            )
     48                        );
    4249                        ?>
    4350                    </span>
    … …  
    5865
    5966                <div class="action">
    60                     <a class="button accept" href="<?php bp_group_accept_invite_link(); ?>"><?php _e( 'Accept', 'buddypress' ); ?></a> &nbsp;
    61                     <a class="button reject confirm" href="<?php bp_group_reject_invite_link(); ?>"><?php _e( 'Reject', 'buddypress' ); ?></a>
     67                    <a class="button accept" href="<?php bp_group_accept_invite_link(); ?>"><?php esc_html_e( 'Accept', 'buddypress' ); ?></a> &nbsp;
     68                    <a class="button reject confirm" href="<?php bp_group_reject_invite_link(); ?>"><?php esc_html_e( 'Reject', 'buddypress' ); ?></a>
    6269
    6370                    <?php

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/invitations/send-invites.php

    r12951 r13822  
    3939        <span class="bp-icon" aria-hidden="true"></span>
    4040        <span class="bp-help-text">
    41             <?php echo apply_filters( 'members_invitations_form_access_restricted', esc_html__( 'Sorry, you are not allowed to send invitations.', 'buddypress' ) ); ?>
     41            <?php echo esc_html( apply_filters( 'members_invitations_form_access_restricted', __( 'Sorry, you are not allowed to send invitations.', 'buddypress' ) ) ); ?>
    4242        </span>
    4343    </p>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages.php

    r12082 r13822  
    4040
    4141        <?php if ( bp_is_messages_inbox() ) : ?>
    42             <h2 class="bp-screen-reader-text"><?php
    43                 /* translators: accessibility text */
    44                 _e( 'Messages inbox', 'buddypress' );
    45             ?></h2>
     42            <h2 class="bp-screen-reader-text">
     43                <?php
     44                    /* translators: accessibility text */
     45                    esc_html_e( 'Messages inbox', 'buddypress' );
     46                ?>
     47            </h2>
    4648        <?php elseif ( bp_is_messages_sentbox() ) : ?>
    47             <h2 class="bp-screen-reader-text"><?php
    48                 /* translators: accessibility text */
    49                 _e( 'Sent Messages', 'buddypress' );
    50             ?></h2>
     49            <h2 class="bp-screen-reader-text">
     50                <?php
     51                    /* translators: accessibility text */
     52                    esc_html_e( 'Sent Messages', 'buddypress' );
     53                ?>
     54            </h2>
    5155        <?php endif; ?>
    5256
    … …  
    8589        do_action( 'bp_before_member_messages_content' ); ?>
    8690
    87         <h2 class="bp-screen-reader-text"><?php
    88             /* translators: accessibility text */
    89             _e( 'Sitewide Notices', 'buddypress' );
    90         ?></h2>
     91        <h2 class="bp-screen-reader-text">
     92            <?php
     93                /* translators: accessibility text */
     94                esc_html_e( 'Sitewide Notices', 'buddypress' );
     95            ?>
     96        </h2>
    9197
    9298        <div class="messages">

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/messages-loop.php

    r13443 r13822  
    1717<?php if ( bp_has_message_threads( bp_ajax_querystring( 'messages' ) ) ) : ?>
    1818
    19     <h2 class="bp-screen-reader-text"><?php
    20         /* translators: accessibility text */
    21         _e( 'Starred messages', 'buddypress' );
    22     ?></h2>
     19    <h2 class="bp-screen-reader-text">
     20        <?php
     21            /* translators: accessibility text */
     22            esc_html_e( 'Starred messages', 'buddypress' );
     23        ?>
     24    </h2>
    2325
    2426    <div class="pagination no-ajax" id="user-pag">
    … …  
    5860            <thead>
    5961                <tr>
    60                     <th scope="col" class="thread-checkbox bulk-select-all"><input id="select-all-messages" type="checkbox"><label class="bp-screen-reader-text" for="select-all-messages"><?php
    61                         /* translators: accessibility text */
    62                         _e( 'Select all', 'buddypress' );
    63                     ?></label></th>
    64                     <th scope="col" class="thread-from"><?php _e( 'From', 'buddypress' ); ?></th>
    65                     <th scope="col" class="thread-info"><?php _e( 'Subject', 'buddypress' ); ?></th>
     62                    <th scope="col" class="thread-checkbox bulk-select-all"><input id="select-all-messages" type="checkbox">
     63                        <label class="bp-screen-reader-text" for="select-all-messages">
     64                            <?php
     65                                /* translators: accessibility text */
     66                                esc_html_e( 'Select all', 'buddypress' );
     67                            ?>
     68                        </label>
     69                    </th>
     70                    <th scope="col" class="thread-from"><?php esc_html_e( 'From', 'buddypress' ); ?></th>
     71                    <th scope="col" class="thread-info"><?php esc_html_e( 'Subject', 'buddypress' ); ?></th>
    6672
    6773                    <?php
    … …  
    7884
    7985                    <?php if ( bp_is_active( 'messages', 'star' ) ) : ?>
    80                         <th scope="col" class="thread-star"><span class="message-action-star"><span class="icon"></span> <span class="screen-reader-text"><?php
    81                             /* translators: accessibility text */
    82                             _e( 'Star', 'buddypress' );
    83                         ?></span></span></th>
     86                        <th scope="col" class="thread-star">
     87                            <span class="message-action-star">
     88                                <span class="icon"></span>
     89                                <span class="screen-reader-text">
     90                                <?php
     91                                    /* translators: accessibility text */
     92                                    esc_html_e( 'Star', 'buddypress' );
     93                                ?>
     94                                </span>
     95                            </span>
     96                        </th>
    8497                    <?php endif; ?>
    8598
    86                     <th scope="col" class="thread-options"><?php _e( 'Actions', 'buddypress' ); ?></th>
     99                    <th scope="col" class="thread-options"><?php esc_html_e( 'Actions', 'buddypress' ); ?></th>
    87100                </tr>
    88101            </thead>
    … …  
    96109                            <label for="bp-message-thread-<?php bp_message_thread_id(); ?>"><input type="checkbox" name="message_ids[]" id="bp-message-thread-<?php bp_message_thread_id(); ?>" class="message-check" value="<?php bp_message_thread_id(); ?>" /><span class="bp-screen-reader-text"><?php
    97110                                /* translators: accessibility text */
    98                                 _e( 'Select this message', 'buddypress' );
     111                                esc_html_e( 'Select this message', 'buddypress' );
    99112                            ?></span></label>
    100113                        </td>
    … …  
    103116                            <td class="thread-from">
    104117                                <?php bp_message_thread_avatar( array( 'width' => 25, 'height' => 25 ) ); ?>
    105                                 <span class="from"><?php _e( 'From:', 'buddypress' ); ?></span> <?php bp_message_thread_from(); ?>
     118                                <span class="from"><?php esc_html_e( 'From:', 'buddypress' ); ?></span> <?php bp_message_thread_from(); ?>
    106119                                <?php bp_message_thread_total_and_unread_count(); ?>
    107120                                <span class="activity"><?php bp_message_thread_last_post_date(); ?></span>
    … …  
    110123                            <td class="thread-from">
    111124                                <?php bp_message_thread_avatar( array( 'width' => 25, 'height' => 25 ) ); ?>
    112                                 <span class="to"><?php _e( 'To:', 'buddypress' ); ?></span> <?php bp_message_thread_to(); ?>
     125                                <span class="to"><?php esc_html_e( 'To:', 'buddypress' ); ?></span> <?php bp_message_thread_to(); ?>
    113126                                <?php bp_message_thread_total_and_unread_count(); ?>
    114127                                <span class="activity"><?php bp_message_thread_last_post_date(); ?></span>
    … …  
    141154                        <td class="thread-options">
    142155                            <?php if ( bp_message_thread_has_unread() ) : ?>
    143                                 <a class="read" href="<?php bp_the_message_thread_mark_read_url( bp_displayed_user_id() );?>"><?php _e( 'Read', 'buddypress' ); ?></a>
     156                                <a class="read" href="<?php bp_the_message_thread_mark_read_url( bp_displayed_user_id() );?>"><?php esc_html_e( 'Read', 'buddypress' ); ?></a>
    144157                            <?php else : ?>
    145                                 <a class="unread" href="<?php bp_the_message_thread_mark_unread_url( bp_displayed_user_id() );?>"><?php _e( 'Unread', 'buddypress' ); ?></a>
     158                                <a class="unread" href="<?php bp_the_message_thread_mark_unread_url( bp_displayed_user_id() );?>"><?php esc_html_e( 'Unread', 'buddypress' ); ?></a>
    146159                            <?php endif; ?>
    147160                             |
    148                             <a class="delete" href="<?php bp_message_thread_delete_link( bp_displayed_user_id() ); ?>"><?php _e( 'Delete', 'buddypress' ); ?></a>
     161                            <a class="delete" href="<?php bp_message_thread_delete_link( bp_displayed_user_id() ); ?>"><?php esc_html_e( 'Delete', 'buddypress' ); ?></a>
    149162
    150163                            <?php
    … …  
    193206
    194207    <div id="message" class="info">
    195         <p><?php _e( 'Sorry, no messages were found.', 'buddypress' ); ?></p>
     208        <p><?php esc_html_e( 'Sorry, no messages were found.', 'buddypress' ); ?></p>
    196209    </div>
    197210

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/notices-loop.php

    r12082 r13822  
    6262                    <?php endif; ?>
    6363
    64                     <span class="activity"><?php _e( 'Sent:', 'buddypress' ); ?> <?php bp_message_notice_post_date(); ?></span>
     64                    <span class="activity"><?php esc_html_e( 'Sent:', 'buddypress' ); ?> <?php bp_message_notice_post_date(); ?></span>
    6565                </td>
    6666
    … …  
    9494
    9595    <div id="message" class="info">
    96         <p><?php _e( 'Sorry, no notices were found.', 'buddypress' ); ?></p>
     96        <p><?php esc_html_e( 'Sorry, no notices were found.', 'buddypress' ); ?></p>
    9797    </div>
    9898

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php

    r13196 r13822  
    2929                <?php if ( bp_get_thread_recipients_count() <= 1 ) : ?>
    3030
    31                     <?php _e( 'You are alone in this conversation.', 'buddypress' ); ?>
     31                    <?php esc_html_e( 'You are alone in this conversation.', 'buddypress' ); ?>
    3232
    3333                <?php elseif ( bp_get_max_thread_recipients_to_list() <= bp_get_thread_recipients_count() ) : ?>
    … …  
    3535                    <?php
    3636                    /* translators: %s: message recipients count */
    37                     printf( __( 'Conversation between %s recipients.', 'buddypress' ), number_format_i18n( bp_get_thread_recipients_count() ) );
     37                    printf( esc_html__( 'Conversation between %s recipients.', 'buddypress' ), esc_html( number_format_i18n( bp_get_thread_recipients_count() ) ) );
    3838                    ?>
    3939
    … …  
    4141
    4242                    <?php
    43                     /* translators: %s: message recipients list */
    44                     printf( __( 'Conversation between %s.', 'buddypress' ), bp_get_thread_recipients_list() );
     43                    printf(
     44                        /* translators: %s: message recipients list */
     45                        esc_html__( 'Conversation between %s.', 'buddypress' ),
     46                        // phpcs:ignore WordPress.Security.EscapeOutput
     47                        bp_get_thread_recipients_list()
     48                    );
    4549                    ?>
    4650
    … …  
    112116                        <?php bp_loggedin_user_avatar( 'type=thumb&height=30&width=30' ); ?>
    113117
    114                         <strong><?php _e( 'Send a Reply', 'buddypress' ); ?></strong>
     118                        <strong><?php esc_html_e( 'Send a Reply', 'buddypress' ); ?></strong>
    115119                    </div>
    116120
    … …  
    133137                    do_action( 'bp_before_message_reply_box' ); ?>
    134138
    135                     <label for="message_content" class="bp-screen-reader-text"><?php
    136                         /* translators: accessibility text */
    137                         _e( 'Reply to Message', 'buddypress' );
    138                     ?></label>
     139                    <label for="message_content" class="bp-screen-reader-text">
     140                        <?php
     141                            /* translators: accessibility text */
     142                            esc_html_e( 'Reply to Message', 'buddypress' );
     143                        ?>
     144                    </label>
    139145                    <textarea name="content" id="message_content" rows="15" cols="40"></textarea>
    140146

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/notifications/feedback-no-notifications.php

    r12082 r13822  
    1515        <?php if ( bp_is_my_profile() ) : ?>
    1616
    17             <p><?php _e( 'You have no unread notifications.', 'buddypress' ); ?></p>
     17            <p><?php esc_html_e( 'You have no unread notifications.', 'buddypress' ); ?></p>
    1818
    1919        <?php else : ?>
    2020
    21             <p><?php _e( 'This member has no unread notifications.', 'buddypress' ); ?></p>
     21            <p><?php esc_html_e( 'This member has no unread notifications.', 'buddypress' ); ?></p>
    2222
    2323        <?php endif; ?>
    … …  
    2727        <?php if ( bp_is_my_profile() ) : ?>
    2828
    29             <p><?php _e( 'You have no notifications.', 'buddypress' ); ?></p>
     29            <p><?php esc_html_e( 'You have no notifications.', 'buddypress' ); ?></p>
    3030
    3131        <?php else : ?>
    3232
    33             <p><?php _e( 'This member has no notifications.', 'buddypress' ); ?></p>
     33            <p><?php esc_html_e( 'This member has no notifications.', 'buddypress' ); ?></p>
    3434
    3535        <?php endif; ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php

    r12082 r13822  
    1414            <tr>
    1515                <th class="icon"></th>
    16                 <th class="bulk-select-all"><input id="select-all-notifications" type="checkbox"><label class="bp-screen-reader-text" for="select-all-notifications"><?php
    17                     /* translators: accessibility text */
    18                     _e( 'Select all', 'buddypress' );
    19                 ?></label></th>
    20                 <th class="title"><?php _e( 'Notification', 'buddypress' ); ?></th>
    21                 <th class="date"><?php _e( 'Date Received', 'buddypress' ); ?></th>
    22                 <th class="actions"><?php _e( 'Actions',    'buddypress' ); ?></th>
     16                <th class="bulk-select-all"><input id="select-all-notifications" type="checkbox">
     17                    <label class="bp-screen-reader-text" for="select-all-notifications">
     18                        <?php
     19                            /* translators: accessibility text */
     20                            esc_html_e( 'Select all', 'buddypress' );
     21                        ?>
     22                    </label>
     23                </th>
     24                <th class="title"><?php esc_html_e( 'Notification', 'buddypress' ); ?></th>
     25                <th class="date"><?php esc_html_e( 'Date Received', 'buddypress' ); ?></th>
     26                <th class="actions"><?php esc_html_e( 'Actions', 'buddypress' ); ?></th>
    2327            </tr>
    2428        </thead>
    … …  
    3034                <tr>
    3135                    <td></td>
    32                     <td class="bulk-select-check"><label for="<?php bp_the_notification_id(); ?>"><input id="<?php bp_the_notification_id(); ?>" type="checkbox" name="notifications[]" value="<?php bp_the_notification_id(); ?>" class="notification-check"><span class="bp-screen-reader-text"><?php
    33                         /* translators: accessibility text */
    34                         _e( 'Select this notification', 'buddypress' );
    35                     ?></span></label></td>
    36                     <td class="notification-description"><?php bp_the_notification_description();  ?></td>
    37                     <td class="notification-since"><?php bp_the_notification_time_since();   ?></td>
     36                    <td class="bulk-select-check">
     37                        <label for="<?php bp_the_notification_id(); ?>">
     38                            <input id="<?php bp_the_notification_id(); ?>" type="checkbox" name="notifications[]" value="<?php bp_the_notification_id(); ?>" class="notification-check">
     39                            <span class="bp-screen-reader-text">
     40                                <?php
     41                                    /* translators: accessibility text */
     42                                    esc_html_e( 'Select this notification', 'buddypress' );
     43                                ?>
     44                            </span>
     45                        </label>
     46                    </td>
     47                    <td class="notification-description"><?php bp_the_notification_description(); ?></td>
     48                    <td class="notification-since"><?php bp_the_notification_time_since(); ?></td>
    3849                    <td class="notification-actions"><?php bp_the_notification_action_links(); ?></td>
    3950                </tr>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php

    r12082 r13822  
    1212<?php if ( bp_has_notifications() ) : ?>
    1313
    14     <h2 class="bp-screen-reader-text"><?php
    15         /* translators: accessibility text */
    16         _e( 'Notifications', 'buddypress' );
    17     ?></h2>
     14    <h2 class="bp-screen-reader-text">
     15        <?php
     16            /* translators: accessibility text */
     17            esc_html_e( 'Notifications', 'buddypress' );
     18        ?>
     19    </h2>
    1820
    1921    <div id="pag-top" class="pagination no-ajax">

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php

    r12082 r13822  
    1212<?php if ( bp_has_notifications() ) : ?>
    1313
    14     <h2 class="bp-screen-reader-text"><?php
    15         /* translators: accessibility text */
    16         _e( 'Unread notifications', 'buddypress' );
    17     ?></h2>
     14    <h2 class="bp-screen-reader-text">
     15        <?php
     16            /* translators: accessibility text */
     17            esc_html_e( 'Unread notifications', 'buddypress' );
     18        ?>
     19    </h2>
    1820
    1921    <div id="pag-top" class="pagination no-ajax">

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php

    r12082 r13822  
    1010?>
    1111
    12 <h2><?php _e( 'Change Profile Photo', 'buddypress' ); ?></h2>
     12<h2><?php esc_html_e( 'Change Profile Photo', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2323<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
    2424
    25     <p><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></p>
     25    <p>
     26        <?php
     27        printf(
     28            esc_html__( 'Your profile photo will be used on your profile and throughout the site. If there is a %s associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ),
     29            '<a href="http://gravatar.com">Gravatar</a>'
     30        );
     31        ?>
     32    </p>
    2633
    2734    <form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
    … …  
    3037
    3138            <?php wp_nonce_field( 'bp_avatar_upload' ); ?>
    32             <p><?php _e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ); ?></p>
     39            <p><?php esc_html_e( 'Click below to select a JPG, GIF or PNG format photo from your computer and then click \'Upload Image\' to proceed.', 'buddypress' ); ?></p>
    3340
    3441            <p id="avatar-upload">
    35                 <label for="file" class="bp-screen-reader-text"><?php
    36                     /* translators: accessibility text */
    37                     _e( 'Select an image', 'buddypress' );
    38                 ?></label>
     42                <label for="file" class="bp-screen-reader-text">
     43                    <?php
     44                        /* translators: accessibility text */
     45                        esc_html_e( 'Select an image', 'buddypress' );
     46                    ?>
     47                </label>
    3948                <input type="file" name="file" id="file" />
    4049                <input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
    … …  
    4352
    4453            <?php if ( bp_get_user_has_avatar() ) : ?>
    45                 <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
    46                 <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
     54                <p><?php esc_html_e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
     55                <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
    4756            <?php endif; ?>
    4857
    … …  
    5160        <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    5261
    53             <h5><?php _e( 'Crop Your New Profile Photo', 'buddypress' ); ?></h5>
     62            <h5><?php esc_html_e( 'Crop Your New Profile Photo', 'buddypress' ); ?></h5>
    5463
    5564            <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
    … …  
    8392<?php else : ?>
    8493
    85     <p><?php _e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with <a href="https://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p>
     94    <p>
     95        <?php
     96        printf(
     97            esc_html__( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with %s using the same email address as you used to register with this site.', 'buddypress' ),
     98            '<a href="https://gravatar.com">Gravatar</a>'
     99        );
     100        ?>
     101    </p>
    86102
    87103<?php endif; ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-cover-image.php

    r12082 r13822  
    1010?>
    1111
    12 <h2><?php _e( 'Change Cover Image', 'buddypress' ); ?></h2>
     12<h2><?php esc_html_e( 'Change Cover Image', 'buddypress' ); ?></h2>
    1313
    1414<?php
    … …  
    2121do_action( 'bp_before_profile_edit_cover_image' ); ?>
    2222
    23 <p><?php _e( 'Your Cover Image will be used to customize the header of your profile.', 'buddypress' ); ?></p>
     23<p><?php esc_html_e( 'Your Cover Image will be used to customize the header of your profile.', 'buddypress' ); ?></p>
    2424
    2525<?php bp_attachments_get_template_part( 'cover-images/index' ); ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/edit.php

    r12595 r13822  
    2828            <?php
    2929            /* translators: %s: profile group name */
    30             printf( __( "Editing '%s' Profile Group", 'buddypress' ), bp_get_the_profile_group_name() );
     30            printf( esc_html__( "Editing '%s' Profile Group", 'buddypress' ), esc_html( bp_get_the_profile_group_name() ) );
    3131            ?>
    3232        </h2>
    … …  
    6363                        <?php
    6464                        printf(
    65                             __( 'This field can be seen by: %s', 'buddypress' ),
    66                             '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
     65                            esc_html__( 'This field can be seen by: %s', 'buddypress' ),
     66                            '<span class="current-visibility-level">' . esc_html( bp_get_the_profile_field_visibility_level_label() ) . '</span>'
    6767                        );
    6868                        ?>
    6969                        </span>
    70                         <button type="button" class="visibility-toggle-link" aria-describedby="<?php bp_the_profile_field_input_name(); ?>-2" aria-expanded="false"><?php _ex( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></button>
     70                        <button type="button" class="visibility-toggle-link" aria-describedby="<?php bp_the_profile_field_input_name(); ?>-2" aria-expanded="false"><?php echo esc_html_x( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></button>
    7171                    </p>
    7272
    7373                    <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id() ?>">
    7474                        <fieldset>
    75                             <legend><?php _e( 'Who can see this field?', 'buddypress' ) ?></legend>
     75                            <legend><?php esc_html_e( 'Who can see this field?', 'buddypress' ) ?></legend>
    7676
    7777                            <?php bp_profile_visibility_radio_buttons() ?>
    7878
    7979                        </fieldset>
    80                         <button type="button" class="field-visibility-settings-close"><?php _e( 'Close', 'buddypress' ) ?></button>
     80                        <button type="button" class="field-visibility-settings-close"><?php esc_html_e( 'Close', 'buddypress' ) ?></button>
    8181                    </div>
    8282                <?php else : ?>
    … …  
    8484                        <?php
    8585                        printf(
    86                             __( 'This field can be seen by: %s', 'buddypress' ),
    87                             '<span class="current-visibility-level">' . bp_get_the_profile_field_visibility_level_label() . '</span>'
     86                            esc_html__( 'This field can be seen by: %s', 'buddypress' ),
     87                            '<span class="current-visibility-level">' . esc_html( bp_get_the_profile_field_visibility_level_label() ) . '</span>'
    8888                        );
    8989                        ?>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/profile-wp.php

    r12082 r13822  
    2727
    2828    <div class="bp-widget wp-profile">
    29         <h2><?php bp_is_my_profile() ? _e( 'My Profile', 'buddypress' ) : printf( __( "%s's Profile", 'buddypress' ), bp_get_displayed_user_fullname() ); ?></h2>
     29        <h2><?php bp_is_my_profile() ? esc_html_e( 'My Profile', 'buddypress' ) : printf( esc_html__( "%s's Profile", 'buddypress' ), esc_html( bp_get_displayed_user_fullname() ) ); ?></h2>
    3030
    3131        <table class="wp-profile-fields">
    … …  
    3434
    3535                <tr id="wp_displayname">
    36                     <td class="label"><?php _e( 'Name', 'buddypress' ); ?></td>
    37                     <td class="data"><?php echo $ud->display_name; ?></td>
     36                    <td class="label"><?php esc_html_e( 'Name', 'buddypress' ); ?></td>
     37                    <td class="data"><?php echo esc_html( $ud->display_name ); ?></td>
    3838                </tr>
    3939
    … …  
    4343
    4444                <tr id="wp_desc">
    45                     <td class="label"><?php _e( 'About Me', 'buddypress' ); ?></td>
    46                     <td class="data"><?php echo $ud->user_description; ?></td>
     45                    <td class="label"><?php esc_html_e( 'About Me', 'buddypress' ); ?></td>
     46                    <td class="data"><?php echo esc_html( $ud->user_description ); ?></td>
    4747                </tr>
    4848
    … …  
    5252
    5353                <tr id="wp_website">
    54                     <td class="label"><?php _e( 'Website', 'buddypress' ); ?></td>
    55                     <td class="data"><?php echo make_clickable( $ud->user_url ); ?></td>
     54                    <td class="label"><?php esc_html_e( 'Website', 'buddypress' ); ?></td>
     55                    <td class="data">
     56                        <?php
     57                        // phpcs:ignore WordPress.Security.EscapeOutput
     58                        echo make_clickable( esc_url( $ud->user_url ) );
     59                        ?>
     60                    </td>
    5661                </tr>
    5762
    … …  
    6166
    6267                <tr id="wp_jabber">
    63                     <td class="label"><?php _e( 'Jabber', 'buddypress' ); ?></td>
    64                     <td class="data"><?php echo $ud->jabber; ?></td>
     68                    <td class="label"><?php esc_html_e( 'Jabber', 'buddypress' ); ?></td>
     69                    <td class="data"><?php echo esc_html( $ud->jabber ); ?></td>
    6570                </tr>
    6671
    … …  
    7075
    7176                <tr id="wp_aim">
    72                     <td class="label"><?php _e( 'AOL Messenger', 'buddypress' ); ?></td>
    73                     <td class="data"><?php echo $ud->aim; ?></td>
     77                    <td class="label"><?php esc_html_e( 'AOL Messenger', 'buddypress' ); ?></td>
     78                    <td class="data"><?php echo esc_html( $ud->aim ); ?></td>
    7479                </tr>
    7580
    … …  
    7984
    8085                <tr id="wp_yim">
    81                     <td class="label"><?php _e( 'Yahoo Messenger', 'buddypress' ); ?></td>
    82                     <td class="data"><?php echo $ud->yim; ?></td>
     86                    <td class="label"><?php esc_html_e( 'Yahoo Messenger', 'buddypress' ); ?></td>
     87                    <td class="data"><?php echo esc_html( $ud->yim ); ?></td>
    8388                </tr>
    8489

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php

    r13443 r13822  
    2424    <label for="user-spammer">
    2525        <input type="checkbox" name="user-spammer" id="user-spammer" value="1" <?php checked( bp_is_user_spammer( bp_displayed_user_id() ) ); ?> />
    26          <?php _e( 'This user is a spammer.', 'buddypress' ); ?>
     26         <?php esc_html_e( 'This user is a spammer.', 'buddypress' ); ?>
    2727    </label>
    2828

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/data.php

    r13472 r13822  
    2525                <?php
    2626                /* translators: %s: expiration date */
    27                 printf( esc_html__( 'You may download your personal data by clicking on the link below. For privacy and security, we will automatically delete the file on %s, so please download it before then.', 'buddypress' ), bp_settings_get_personal_data_expiration_date( $request ) );
     27                printf( esc_html__( 'You may download your personal data by clicking on the link below. For privacy and security, we will automatically delete the file on %s, so please download it before then.', 'buddypress' ), esc_html( bp_settings_get_personal_data_expiration_date( $request ) ) );
    2828                ?>
    2929            </p>
    3030
    31             <p><strong><?php printf( '<a href="%1$s">%2$s</a>', bp_settings_get_personal_data_export_url( $request ), esc_html__( 'Download personal data', 'buddypress' ) ); ?></strong></p>
     31            <p><strong><?php printf( '<a href="%1$s">%2$s</a>', esc_url( bp_settings_get_personal_data_export_url( $request ) ), esc_html__( 'Download personal data', 'buddypress' ) ); ?></strong></p>
    3232
    3333        <?php else : ?>
    … …  
    3737
    3838            <form id="bp-data-export" method="post">
    39                 <input type="hidden" name="bp-data-export-delete-request-nonce" value="<?php echo wp_create_nonce( 'bp-data-export-delete-request' ); ?>" />
    40                 <button type="submit" name="bp-data-export-nonce" value="<?php echo wp_create_nonce( 'bp-data-export' ); ?>"><?php esc_html_e( 'Request new data export', 'buddypress' ); ?></button>
     39                <input type="hidden" name="bp-data-export-delete-request-nonce" value="<?php echo esc_attr( wp_create_nonce( 'bp-data-export-delete-request' ) ); ?>" />
     40                <button type="submit" name="bp-data-export-nonce" value="<?php echo esc_attr( wp_create_nonce( 'bp-data-export' ) ); ?>"><?php esc_html_e( 'Request new data export', 'buddypress' ); ?></button>
    4141            </form>
    4242
    … …  
    4848            <?php
    4949            /* translators: %s: confirmation date */
    50             printf( esc_html__( 'You previously requested an export of your personal data on %s.', 'buddypress' ), bp_settings_get_personal_data_confirmation_date( $request ) );
     50            printf( esc_html__( 'You previously requested an export of your personal data on %s.', 'buddypress' ), esc_html( bp_settings_get_personal_data_confirmation_date( $request ) ) );
    5151            ?>
    5252        </p>
    … …  
    6464
    6565    <form id="bp-data-export" method="post">
    66         <button type="submit" name="bp-data-export-nonce" value="<?php echo wp_create_nonce( 'bp-data-export' ); ?>"><?php esc_html_e( 'Request personal data export', 'buddypress' ); ?></button>
     66        <button type="submit" name="bp-data-export-nonce" value="<?php echo esc_attr( wp_create_nonce( 'bp-data-export' ) ); ?>"><?php esc_html_e( 'Request personal data export', 'buddypress' ); ?></button>
    6767    </form>
    6868

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/delete-account.php

    r13443 r13822  
    1515    <?php if ( bp_is_my_profile() ) : ?>
    1616
    17         <p><?php _e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
     17        <p><?php esc_html_e( 'Deleting your account will delete all of the content you have created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
    1818
    1919    <?php else : ?>
    2020
    21         <p><?php _e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
     21        <p><?php esc_html_e( 'Deleting this account will delete all of the content it has created. It will be completely irrecoverable.', 'buddypress' ); ?></p>
    2222
    2323    <?php endif; ?>
    … …  
    3838    <label for="delete-account-understand">
    3939        <input type="checkbox" name="delete-account-understand" id="delete-account-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-account-button').disabled = ''; } else { document.getElementById('delete-account-button').disabled = 'disabled'; }" />
    40          <?php _e( 'I understand the consequences.', 'buddypress' ); ?>
     40         <?php esc_html_e( 'I understand the consequences.', 'buddypress' ); ?>
    4141    </label>
    4242

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/general.php

    r13443 r13822  
    1111do_action( 'bp_before_member_settings_template' ); ?>
    1212
    13 <h2 class="bp-screen-reader-text"><?php
    14     /* translators: accessibility text */
    15     _e( 'Account settings', 'buddypress' );
    16 ?></h2>
     13<h2 class="bp-screen-reader-text">
     14    <?php
     15        /* translators: accessibility text */
     16        esc_html_e( 'Account settings', 'buddypress' );
     17    ?>
     18</h2>
    1719
    1820<form action="<?php bp_displayed_user_link( array( bp_get_settings_slug(), 'general' ) ); ?>" method="post" class="standard-form" id="settings-form">
    … …  
    2022    <?php if ( ! is_super_admin() ) : ?>
    2123
    22         <label for="pwd"><?php _e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
    23         <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo wp_lostpassword_url(); ?>"><?php _e( 'Lost your password?', 'buddypress' ); ?></a>
     24        <label for="pwd"><?php esc_html_e( 'Current Password <span>(required to update email or change current password)</span>', 'buddypress' ); ?></label>
     25        <input type="password" name="pwd" id="pwd" size="16" value="" class="settings-input small" <?php bp_form_field_attributes( 'password' ); ?>/> &nbsp;<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php esc_html_e( 'Lost your password?', 'buddypress' ); ?></a>
    2426
    2527    <?php endif; ?>
    2628
    27     <label for="email"><?php _e( 'Account Email', 'buddypress' ); ?></label>
    28     <input type="email" name="email" id="email" value="<?php echo bp_get_displayed_user_email(); ?>" class="settings-input" <?php bp_form_field_attributes( 'email' ); ?>/>
     29    <label for="email"><?php esc_html_e( 'Account Email', 'buddypress' ); ?></label>
     30    <input type="email" name="email" id="email" value="<?php echo esc_attr( bp_get_displayed_user_email() ); ?>" class="settings-input" <?php bp_form_field_attributes( 'email' ); ?>/>
    2931
    30     <label for="pass1"><?php _e( 'Change Password <span>(leave blank for no change)</span>', 'buddypress' ); ?></label>
     32    <label for="pass1"><?php printf( esc_html__( 'Change Password %s', 'buddypress' ), '<span>' . esc_html__( '(leave blank for no change)', 'buddypress' ) . '</span>' ); ?></label>
    3133    <input type="password" name="pass1" id="pass1" size="16" value="" class="settings-input small password-entry" <?php bp_form_field_attributes( 'password' ); ?>/>
    3234    <div id="pass-strength-result"></div>
    33     <label for="pass2"><?php _e( 'Repeat New Password', 'buddypress' );
     35    <label for="pass2"><?php esc_html_e( 'Repeat New Password', 'buddypress' );
    3436    ?></label>
    3537    <input type="password" name="pass2" id="pass2" size="16" value="" class="settings-input small password-entry-confirm" <?php bp_form_field_attributes( 'password' ); ?>/>

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php

    r13443 r13822  
    1111do_action( 'bp_before_member_settings_template' ); ?>
    1212
    13 <h2 class="bp-screen-reader-text"><?php
    14     /* translators: accessibility text */
    15     _e( 'Notification settings', 'buddypress' );
    16 ?></h2>
     13<h2 class="bp-screen-reader-text">
     14    <?php
     15        /* translators: accessibility text */
     16        esc_html_e( 'Notification settings', 'buddypress' );
     17    ?>
     18</h2>
    1719
    1820<form action="<?php bp_displayed_user_link( array( bp_get_settings_slug(), 'notifications' ) ); ?>" method="post" class="standard-form" id="settings-form">
    19     <p><?php _e( 'Send an email notice when:', 'buddypress' ); ?></p>
     21    <p><?php esc_html_e( 'Send an email notice when:', 'buddypress' ); ?></p>
    2022
    2123    <?php

  • trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/profile.php

    r13443 r13822  
    1515do_action( 'bp_before_member_settings_template' ); ?>
    1616
    17 <h2 class="bp-screen-reader-text"><?php
    18     /* translators: accessibility text */
    19     _e( 'Profile visibility settings', 'buddypress' );
    20 ?></h2>
     17<h2 class="bp-screen-reader-text">
     18    <?php
     19        /* translators: accessibility text */
     20        esc_html_e( 'Profile visibility settings', 'buddypress' );
     21    ?>
     22</h2>
    2123
    2224<form action="<?php bp_displayed_user_link( array( bp_get_settings_slug(), 'profile' ) ); ?>" method="post" class="standard-form" id="settings-form">
    … …  
    3234                        <tr>
    3335                            <th class="title field-group-name"><?php bp_the_profile_group_name(); ?></th>
    34                             <th class="title"><?php _e( 'Visibility', 'buddypress' ); ?></th>
     36                            <th class="title"><?php esc_html_e( 'Visibility', 'buddypress' ); ?></th>
    3537                        </tr>
    3638                    </thead>
Note: See TracChangeset for help on using the changeset viewer.