Ticket #8913: 8913.4.patch

bp-members-notifications.php

@@ -89 +89 @@
         }
 
         // Return either an HTML link or an array, depending on the requested format.
-        if ( 'string' == $format ) {
+        if ( 'string' === $format ) {
 
                 /**
                  * Filters the format of members notifications based on type and amount * of notifications pending.
@@ -240 +240 @@
                 <thead>
                         <tr>
                                 <th class="icon"></th>
-                                <th class="title"><?php _ex( 'Members', 'Member settings on notification settings page', 'buddypress' ) ?></th>
-                                <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
-                                <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+                                <th class="title"><?php esc_html_x( 'Members', 'Member settings on notification settings page', 'buddypress' ) ?></th>
+                                <th class="yes"><?php esc_html_e( 'Yes', 'buddypress' ) ?></th>
+                                <th class="no"><?php esc_html_e( 'No', 'buddypress' )?></th>
                         </tr>
                 </thead>
 

classes/class-bp-members-admin.php

@@ -922 +922 @@
                          */
                         if ( current_user_can( 'edit_user', $user->ID ) ) : ?>
 
-                                <a class="nav-tab<?php echo esc_attr( $wp_active ); ?>" href="<?php echo esc_url( $wordpress_url );?>"><?php _e( 'Profile', 'buddypress' ); ?></a>
+                                <a class="nav-tab<?php echo esc_attr( $wp_active ); ?>" href="<?php echo esc_url( $wordpress_url );?>"><?php esc_html_e( 'Profile', 'buddypress' ); ?></a>
 
                         <?php endif; ?>
 
-                        <a class="nav-tab<?php echo esc_attr( $bp_active ); ?>" href="<?php echo esc_url( $community_url );?>"><?php _e( 'Extended Profile', 'buddypress' ); ?></a>
+                        <a class="nav-tab<?php echo esc_attr( $bp_active ); ?>" href="<?php echo esc_url( $community_url );?>"><?php esc_html_e( 'Extended Profile', 'buddypress' ); ?></a>
                 </h2>
 
                 <?php
@@ -1910 +1910 @@
                         }
 
                         // Handle resent activation links.
-                        if ( 'do_resend' == $doaction ) {
+                        if ( 'do_resend' === $doaction ) {
 
                                 // Nonce check.
                                 check_admin_referer( 'signups_resend' );
@@ -1937 +1937 @@
                                 bp_core_redirect( $redirect_to );
 
                         // Handle activated accounts.
-                        } elseif ( 'do_activate' == $doaction ) {
+                        } elseif ( 'do_activate' === $doaction ) {
 
                                 // Nonce check.
                                 check_admin_referer( 'signups_activate' );
@@ -1964 +1964 @@
                                 bp_core_redirect( $redirect_to );
 
                         // Handle sign-ups delete.
-                        } elseif ( 'do_delete' == $doaction ) {
+                        } elseif ( 'do_delete' === $doaction ) {
 
                                 // Nonce check.
                                 check_admin_referer( 'signups_delete' );
@@ -2305 +2305 @@
                 ?>
 
                 <div class="wrap">
-                        <h1 class="wp-heading-inline"><?php _e( 'Users', 'buddypress' ); ?></h1>
+                        <h1 class="wp-heading-inline"><?php esc_html_e( 'Users', 'buddypress' ); ?></h1>
 
                         <?php if ( current_user_can( 'create_users' ) ) : ?>
 
@@ -2378 +2378 @@
                 switch ( $action ) {
                         case 'delete' :
                                 $header_text = __( 'Delete Pending Accounts', 'buddypress' );
-                                if ( 1 == count( $signup_ids ) ) {
+                                if ( 1 === count( $signup_ids ) ) {
                                         $helper_text = __( 'You are about to delete the following account:', 'buddypress' );
                                 } else {
                                         $helper_text = __( 'You are about to delete the following accounts:', 'buddypress' );
@@ -2387 +2387 @@
 
                         case 'activate' :
                                 $header_text = __( 'Activate Pending Accounts', 'buddypress' );
-                                if ( 1 == count( $signup_ids ) ) {
+                                if ( 1 === count( $signup_ids ) ) {
                                         $helper_text = __( 'You are about to activate the following account:', 'buddypress' );
                                 } else {
                                         $helper_text = __( 'You are about to activate the following accounts:', 'buddypress' );
@@ -2441 +2441 @@
 
                 // Prefetch registration field data.
                 $fdata = array();
-                if ( bp_is_active( 'xprofile' ) && ( 'activate' == $action || ( 'resend' == $action && bp_get_membership_requests_required() ) ) ) {
+                if ( bp_is_active( 'xprofile' ) && ( 'activate' === $action || ( 'resend' === $action && bp_get_membership_requests_required() ) ) ) {
                         $field_groups = bp_xprofile_get_groups( array(
                                 'exclude_fields'    => 1,
                                 'update_meta_cache' => false,
@@ -2481 +2481 @@
                                 <li>
                                         <strong><?php echo esc_html( $signup->user_login ) ?></strong>
 
-                                        <?php if ( 'activate' == $action || ( 'resend' == $action && bp_get_membership_requests_required() ) ) : ?>
+                                        <?php if ( 'activate' === $action || ( 'resend' === $action && bp_get_membership_requests_required() ) ) : ?>
                                                 <table class="wp-list-table widefat fixed striped">
                                                         <tbody>
                                                                 <tr>
@@ -2595 +2595 @@
 
                 $types = bp_get_member_types( array(), 'objects' ); ?>
 
-                <label class="screen-reader-text" for="<?php echo $id_name; ?>"><?php _e( 'Change member type to&hellip;', 'buddypress' ) ?></label>
+                <label class="screen-reader-text" for="<?php echo $id_name; ?>"><?php esc_html_e( 'Change member type to&hellip;', 'buddypress' ) ?></label>
                 <select name="<?php echo $id_name; ?>" id="<?php echo $id_name; ?>" style="display:inline-block;float:none;">
-                        <option value=""><?php _e( 'Change member type to&hellip;', 'buddypress' ) ?></option>
+                        <option value=""><?php esc_html_e( 'Change member type to&hellip;', 'buddypress' ) ?></option>
 
                         <?php foreach( $types as $type ) : ?>
 
@@ -2605 +2605 @@
 
                         <?php endforeach; ?>
 
-                        <option value="remove_member_type"><?php _e( 'No Member Type', 'buddypress' ) ?></option>
+                        <option value="remove_member_type"><?php esc_html_e( 'No Member Type', 'buddypress' ) ?></option>
 
                 </select>
                 <?php