Changeset 13904

Timestamp:

06/04/2024 02:32:30 AM (3 months ago)

Author:

espellcaste

Message:

WPCS: Part XI: miscellaneous fixes for some of the files of the core component.

Follow-up to [13903]

See #9164 and #7228

Location:

trunk/src/bp-core

Files:

• bp-core-buddybar.php (modified) (20 diffs)
• bp-core-cache.php (modified) (7 diffs)
• bp-core-catchuri.php (modified) (18 diffs)
• bp-core-dependency.php (modified) (2 diffs)
• bp-core-filters.php (modified) (34 diffs)

trunk/src/bp-core/bp-core-buddybar.php

@@ -72 +72 @@
     // Then, hook the screen function for the added nav item.
     $hooked = bp_core_register_nav_screen_function( $nav_item );
-    if ( false === $hooked ){
+    if ( false === $hooked ) {
         return false;
     }
@@ -129 +129 @@
         'position'                => 99,    // Index of where this nav item should be positioned.
         'screen_function'         => false, // The name of the function to run when clicked.
-        'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
+        'default_subnav_slug'     => false,  // The slug of the default subnav item to select when clicked.
     );
 
@@ -163 +163 @@
         'position'                => $r['position'],
         'screen_function'         => &$r['screen_function'],
-        'default_subnav_slug'     => $r['default_subnav_slug']
+        'default_subnav_slug'     => $r['default_subnav_slug'],
     );
 
@@ -218 +218 @@
         'position'                => 99,    // Index of where this nav item should be positioned.
         'screen_function'         => false, // The name of the function to run when clicked.
-        'default_subnav_slug'     => false  // The slug of the default subnav item to select when clicked.
+        'default_subnav_slug'     => false,  // The slug of the default subnav item to select when clicked.
     );
 
@@ -253 +253 @@
      * directory or something else.
      */
-    if ( ( -1 != $r['position'] ) && bp_is_root_component( $r['slug'] ) && ! bp_displayed_user_id() ) {
+    if ( ( -1 !== $r['position'] ) && bp_is_root_component( $r['slug'] ) && ! bp_displayed_user_id() ) {
         return;
     }
@@ -307 +307 @@
  *
  * @param array|string $args {
+ *     Optional. Array describing the new default subnav item.
+ *
  *     @type string   $parent_slug     The slug of the nav item whose default is being changed.
  *     @type callable $screen_function The new default callback function that will run when the nav item is clicked.
@@ -318 +320 @@
         'parent_slug'     => false, // Slug of the parent.
         'screen_function' => false, // The name of the function to run when clicked.
-        'subnav_slug'     => false  // The slug of the subnav item to select when clicked.
+        'subnav_slug'     => false,  // The slug of the subnav item to select when clicked.
     );
 
@@ -330 +332 @@
 
     if ( ! $parent_nav ) {
-        return ;
+        return;
     }
 
@@ -381 +383 @@
         // The only way to tell whether to set the subnav is to peek at the unfiltered_uri
         // Find the component.
-        $component_uri_key = array_search( $parent_nav->slug, $bp->unfiltered_uri );
+        $component_uri_key = array_search( $parent_nav->slug, $bp->unfiltered_uri, true );
 
         if ( false !== $component_uri_key ) {
-            if ( ! empty( $bp->unfiltered_uri[$component_uri_key + 1] ) ) {
-                $unfiltered_action = $bp->unfiltered_uri[$component_uri_key + 1];
+            if ( ! empty( $bp->unfiltered_uri[ $component_uri_key + 1 ] ) ) {
+                $unfiltered_action = $bp->unfiltered_uri[ $component_uri_key + 1 ];
             }
         }
@@ -415 +417 @@
             }
 
-        // The URL is explicitly requesting the new subnav item, but should be
-        // directed to the canonical URL.
-        } elseif ( $unfiltered_action == $r['subnav_slug'] ) {
+            // The URL is explicitly requesting the new subnav item, but should be
+            // directed to the canonical URL.
+        } elseif ( $unfiltered_action === $r['subnav_slug'] ) {
             unset( $bp->canonical_stack['action'] );
 
-        // In all other cases (including the case where the original subnav item
-        // is explicitly called in the URL), the canonical URL will contain the
-        // subnav slug.
+            // In all other cases (including the case where the original subnav item
+            // is explicitly called in the URL), the canonical URL will contain the
+            // subnav slug.
         } else {
             $bp->canonical_stack['action'] = bp_current_action();
         }
     }
-
-    return;
 }
 
@@ -459 +459 @@
  *                                          Admin Bar menu for group admins. Default: false.
  * }
- * @param string|null    $component The component the navigation is attached to. Defaults to 'members'.
+ * @param string|null  $component The component the navigation is attached to. Defaults to 'members'.
  * @return null|false Returns false on failure.
  */
@@ -637 +637 @@
         $args,
         array(
-            'slug'              => false, // URL slug for the screen.
-            'parent_slug'       => false, // URL slug of the parent screen.
-            'user_has_access'   => true,  // Can the user visit this screen?
-            'no_access_url'     => '',
-            'site_admin_only'   => false, // Can only site admins visit this screen?
-            'screen_function'   => false, // The name of the function to run when clicked.
+            'slug'            => false, // URL slug for the screen.
+            'parent_slug'     => false, // URL slug of the parent screen.
+            'user_has_access' => true,  // Can the user visit this screen?
+            'no_access_url'   => '',
+            'site_admin_only' => false, // Can only site admins visit this screen?
+            'screen_function' => false, // The name of the function to run when clicked.
         )
     );
@@ -674 +674 @@
 
     // If we *do* meet condition (2), then the added subnav item is currently being requested.
-    if ( ( bp_current_action() && bp_is_current_action( $r['slug'] ) ) || ( bp_is_user() && ! bp_current_action() && ! empty( $parent_nav->screen_function ) && $r['screen_function'] == $parent_nav->screen_function ) ) {
+    if ( ( bp_current_action() && bp_is_current_action( $r['slug'] ) ) || ( bp_is_user() && ! bp_current_action() && ! empty( $parent_nav->screen_function ) && $r['screen_function'] === $parent_nav->screen_function ) ) {
 
         // If this is for site admins only and the user is not one, don't create the subnav item.
@@ -719 +719 @@
             $retval['status'] = 'failure';
 
-        // Success - hook to bp_screens.
+            // Success - hook to bp_screens.
         } else {
             add_action( 'bp_screens', $subnav_item['screen_function'], 3 );
@@ -725 +725 @@
         }
 
-    // User doesn't have access. Determine redirect arguments based on
-    // user status.
+        // User doesn't have access. Determine redirect arguments based on
+        // user status.
     } else {
         $retval['status'] = 'failure';
@@ -739 +739 @@
                 $redirect_to = trailingslashit( $subnav_item['no_access_url'] );
 
-            // In the case of a user page, we try to assume a
-            // redirect URL.
+                // In the case of a user page, we try to assume a
+                // redirect URL.
             } elseif ( bp_is_user() ) {
 
@@ -755 +755 @@
                     $redirect_to = bp_displayed_user_url();
 
-                // In some cases, the default tab is not accessible to
-                // the logged-in user. So we fall back on a tab that we
-                // know will be accessible.
+                    // In some cases, the default tab is not accessible to
+                    // the logged-in user. So we fall back on a tab that we
+                    // know will be accessible.
                 } else {
                     // Try 'activity' first.
@@ -771 +771 @@
                 }
 
-            // Fall back to the home page.
+                // Fall back to the home page.
             } else {
                 $message     = __( 'You do not have access to this page.', 'buddypress' );
@@ -781 +781 @@
                 'root'     => $redirect_to,
                 'redirect' => false,
-                'mode'     => 1
+                'mode'     => 1,
             );
 
@@ -987 +987 @@
 function bp_get_admin_bar_pref( $context, $user = 0 ) {
     $pref = get_user_option( "show_admin_bar_{$context}", $user );
-    if ( false === $pref )
+    if ( false === $pref ) {
         return true;
+    }
 
     return 'true' === $pref;

trunk/src/bp-core/bp-core-cache.php

@@ -65 +65 @@
     delete_transient( 'bp_active_member_count' );
 }
-add_action( 'bp_core_activated_user',         'bp_core_clear_member_count_caches' );
+add_action( 'bp_core_activated_user', 'bp_core_clear_member_count_caches' );
 add_action( 'bp_core_process_spammer_status', 'bp_core_clear_member_count_caches' );
-add_action( 'bp_core_deleted_account',        'bp_core_clear_member_count_caches' );
-add_action( 'bp_first_activity_for_member',   'bp_core_clear_member_count_caches' );
-add_action( 'deleted_user',                   'bp_core_clear_member_count_caches' );
+add_action( 'bp_core_deleted_account', 'bp_core_clear_member_count_caches' );
+add_action( 'bp_first_activity_for_member', 'bp_core_clear_member_count_caches' );
+add_action( 'deleted_user', 'bp_core_clear_member_count_caches' );
 
 /**
@@ -93 +93 @@
 
     // Bail if post ID is not a directory page.
-    if ( ! in_array( $post_id, $page_ids ) ) {
+    if ( ! in_array( $post_id, $page_ids, true ) ) {
         return;
     }
@@ -134 +134 @@
     }
 
-    $keys = array_merge( $keys, array(
-        'registration',
-        'avatar_default',
-        'tags_blog_id',
-        'sitewide_tags_blog',
-        'registration',
-        'fileupload_mask',
-    ) );
-
-    if ( in_array( $option, $keys ) ) {
+    $keys = array_merge(
+        $keys,
+        array(
+            'registration',
+            'avatar_default',
+            'tags_blog_id',
+            'sitewide_tags_blog',
+            'registration',
+            'fileupload_mask',
+        )
+    );
+
+    if ( in_array( $option, $keys, true ) ) {
         wp_cache_delete( 'root_blog_options', 'bp' );
     }
@@ -207 +210 @@
         $args,
         array(
-            'object_ids'       => array(), // Comma-separated list or array of item ids.
-            'object_type'      => '',      // Canonical component id: groups, members, etc.
+            'object_ids'       => array(), // Comma-separated list or array of item ids.
+            'object_type'      => '',      // Canonical component id: groups, members, etc.
             'cache_group'      => '',      // Cache group.
-            'meta_table'       => '',      // Name of the table containing the metadata.
+            'meta_table'       => '',      // Name of the table containing the metadata.
             'object_column'    => '',      // DB column for the object ids (group_id, etc).
             'cache_key_prefix' => '',      // Prefix to use when creating cache key names. Eg 'bp_groups_groupmeta'.
@@ -246 +249 @@
         if ( ! empty( $meta_list ) ) {
             foreach ( $meta_list as $metarow ) {
-                $mpid = intval( $metarow[$object_column] );
+                $mpid = intval( $metarow[ $object_column ] );
                 $mkey = $metarow['meta_key'];
                 $mval = $metarow['meta_value'];
 
                 // Force subkeys to be array type.
-                if ( !isset( $cache[$mpid] ) || !is_array( $cache[$mpid] ) )
-                    $cache[$mpid] = array();
-                if ( !isset( $cache[$mpid][$mkey] ) || !is_array( $cache[$mpid][$mkey] ) )
-                    $cache[$mpid][$mkey] = array();
+                if ( ! isset( $cache[ $mpid ] ) || ! is_array( $cache[ $mpid ] ) ) {
+                    $cache[ $mpid ] = array();
+                }
+                if ( ! isset( $cache[ $mpid ][ $mkey ] ) || ! is_array( $cache[ $mpid ][ $mkey ] ) ) {
+                    $cache[ $mpid ][ $mkey ] = array();
+                }
 
                 // Add a value to the current pid/key.
-                $cache[$mpid][$mkey][] = $mval;
+                $cache[ $mpid ][ $mkey ][] = $mval;
             }
         }
@@ -345 +350 @@
 function bp_core_get_incremented_cache_key( $key, $group ) {
     $incrementor = bp_core_get_incrementor( $group );
-    $cache_key = md5( $key . $incrementor );
+    $cache_key   = md5( $key . $incrementor );
     return $cache_key;
 }
@@ -414 +419 @@
  * @since 7.0.0
  *
- * @param int $type_id The Type's term ID.
+ * @param int    $type_id The Type's term ID.
  * @param string $taxonomy The Type's taxonomy name.
  */

trunk/src/bp-core/bp-core-catchuri.php

@@ -46 +46 @@
  * @since 1.6.0
  *
- * @return bool True if yes, false if no.
+ * @return bool
  */
 function bp_core_enable_root_profiles() {
@@ -52 +52 @@
     $retval = false;
 
-    if ( defined( 'BP_ENABLE_ROOT_PROFILES' ) && ( true == BP_ENABLE_ROOT_PROFILES ) )
+    if ( defined( 'BP_ENABLE_ROOT_PROFILES' ) && ( true === BP_ENABLE_ROOT_PROFILES ) ) {
         $retval = true;
+    }
 
     /**
@@ -82 +83 @@
 
     // Reset the post.
-    bp_theme_compat_reset_post( array(
-        'ID'          => 0,
-        'is_404'      => true,
-        'post_status' => 'publish',
-    ) );
+    bp_theme_compat_reset_post(
+        array(
+            'ID'          => 0,
+            'is_404'      => true,
+            'post_status' => 'publish',
+        )
+    );
 
     // Set theme compat to false since the reset post function automatically sets
@@ -118 +121 @@
         }
 
-    // Theme compat doesn't require a template lookup.
+        // Theme compat doesn't require a template lookup.
     } else {
         $template = '';
@@ -185 +188 @@
         exit();
 
-    // No template found, so setup theme compatibility.
-    // @todo Some other 404 handling if theme compat doesn't kick in.
+        // No template found, so setup theme compatibility.
+        // @todo Some other 404 handling if theme compat doesn't kick in.
     } else {
 
@@ -291 +294 @@
     // If coming from bp_core_redirect() and $bp_no_status_set is true,
     // we are redirecting to an accessible page so skip this check.
-    if ( !empty( $bp->no_status_set ) )
+    if ( ! empty( $bp->no_status_set ) ) {
         return false;
-
-    if ( !isset( $wp_query->queried_object ) && !bp_is_blog_page() ) {
+    }
+
+    if ( ! isset( $wp_query->queried_object ) && ! bp_is_blog_page() ) {
         bp_do_404();
     }
@@ -310 +314 @@
  *
  * @param array|string $args {
+ *     Optional. Array of arguments for redirecting user when visiting access controlled areas.
  *     @type int    $mode     Specifies the destination of the redirect. 1 will
  *                            direct to the root domain (home page), which assumes you have a
@@ -332 +337 @@
         'redirect' => $redirect_url,        // the URL you get redirected to when a user successfully logs in.
         'root'     => bp_get_root_url(),    // the landing page you get redirected to when a user doesn't have access.
-        'message'  => __( 'You must log in to access the page you requested.', 'buddypress' )
+        'message'  => __( 'You must log in to access the page you requested.', 'buddypress' ),
     );
 
@@ -348 +353 @@
      */
     $r = apply_filters( 'bp_core_no_access', $r );
+
     extract( $r, EXTR_SKIP );
 
@@ -353 +359 @@
      * @ignore Ignore these filters and use 'bp_core_no_access' above.
      */
-    $mode     = apply_filters( 'bp_no_access_mode',     $mode,     $root,     $redirect, $message );
-    $redirect = apply_filters( 'bp_no_access_redirect', $redirect, $root,     $message,  $mode    );
-    $root     = apply_filters( 'bp_no_access_root',     $root,     $redirect, $message,  $mode    );
-    $message  = apply_filters( 'bp_no_access_message',  $message,  $root,     $redirect, $mode    );
+    $mode     = apply_filters( 'bp_no_access_mode', $mode, $root, $redirect, $message );
+    $redirect = apply_filters( 'bp_no_access_redirect', $redirect, $root, $message, $mode );
+    $root     = apply_filters( 'bp_no_access_root', $root, $redirect, $message, $mode );
+    $message  = apply_filters( 'bp_no_access_message', $message, $root, $redirect, $mode );
     $root     = trailingslashit( $root );
 
@@ -363 +369 @@
         // Option to redirect to wp-login.php.
         // Error message is displayed with bp_core_no_access_wp_login_error().
-        case 2 :
-            if ( !empty( $redirect ) ) {
-                bp_core_redirect( add_query_arg( array(
-                    'bp-auth' => 1,
-                    'action'  => 'bpnoaccess'
-                ), wp_login_url( $redirect ) ) );
+        case 2:
+            if ( ! empty( $redirect ) ) {
+                bp_core_redirect(
+                    add_query_arg(
+                        array(
+                            'bp-auth' => 1,
+                            'action'  => 'bpnoaccess',
+                        ),
+                        wp_login_url( $redirect )
+                    )
+                );
             } else {
                 bp_core_redirect( $root );
@@ -377 +388 @@
         // Redirect to root with "redirect_to" parameter.
         // Error message is displayed with bp_core_add_message().
-        case 1 :
-        default :
-
+        case 1:
+        default:
             $url = $root;
-            if ( !empty( $redirect ) ) {
+            if ( ! empty( $redirect ) ) {
                 $url = add_query_arg( 'redirect_to', urlencode( $redirect ), $root );
             }
 
-            if ( !empty( $message ) ) {
+            if ( ! empty( $message ) ) {
                 bp_core_add_message( $message, 'error' );
             }
@@ -502 +512 @@
 
         // Build the URL in the address bar.
-        $requested_url  = bp_get_requested_url();
-        $query_args     = '';
+        $requested_url = bp_get_requested_url();
+        $query_args    = '';
 
         // Stash query args.
@@ -582 +592 @@
     // is set to be the front page, ensure that the current canonical URL
     // is the home page URL.
-    if ( 'page' == get_option( 'show_on_front' ) && $page_on_front = (int) get_option( 'page_on_front' ) ) {
-        $front_page_component = array_search( $page_on_front, bp_core_get_directory_page_ids() );
+    if ( 'page' === get_option( 'show_on_front' ) && $page_on_front = (int) get_option( 'page_on_front' ) ) {
+        $front_page_component = array_search( $page_on_front, bp_core_get_directory_page_ids(), true );
 
         /*
@@ -595 +605 @@
             $bp->canonical_stack['canonical_url'] = trailingslashit( bp_get_root_url() );
 
-        // Except when the front page is set to the registration page
-        // and the current user is logged in. In this case we send to
-        // the members directory to avoid redirect loops.
-        } elseif ( bp_is_register_page() && 'register' == $front_page_component && is_user_logged_in() ) {
+            // Except when the front page is set to the registration page
+            // and the current user is logged in. In this case we send to
+            // the members directory to avoid redirect loops.
+        } elseif ( bp_is_register_page() && 'register' === $front_page_component && is_user_logged_in() ) {
 
             /**
@@ -613 +623 @@
     if ( empty( $bp->canonical_stack['canonical_url'] ) ) {
         // Build the URL in the address bar.
-        $requested_url  = bp_get_requested_url();
-        $base_url       = '';
-        $path_chunks    = array();
-        $component_id   = '';
+        $requested_url = bp_get_requested_url();
+        $base_url      = '';
+        $path_chunks   = array();
+        $component_id  = '';
 
         // Get query args.
@@ -678 +688 @@
         } elseif ( isset( $query_args['bp_member_action'] ) && 'members' === $component_id ) {
             unset( $query_args['bp_member_action'] );
-        } elseif( isset( $query_args['bp_group_action'] ) && 'groups' === $component_id ) {
+        } elseif ( isset( $query_args['bp_group_action'] ) && 'groups' === $component_id ) {
             unset( $query_args['bp_group_action'] );
         }
@@ -750 +760 @@
  */
 function _bp_maybe_remove_redirect_canonical() {
-    if ( ! bp_is_blog_page() )
+    if ( ! bp_is_blog_page() ) {
         remove_action( 'template_redirect', 'redirect_canonical' );
+    }
 }
 

trunk/src/bp-core/bp-core-dependency.php

@@ -796 +796 @@
      * @param string $action The action being run.
      */
-    do_action( 'bp_post_request',   $action );
+    do_action( 'bp_post_request', $action );
 }
 
@@ -838 +838 @@
      * @param string $action The action being run.
      */
-    do_action( 'bp_get_request',   $action );
-}
+    do_action( 'bp_get_request', $action );
+}

trunk/src/bp-core/bp-core-filters.php

@@ -41 +41 @@
  *           v--WordPress Actions       v--BuddyPress Sub-actions
  */
-add_filter( 'request',                 'bp_request',             10    );
-add_filter( 'template_include',        'bp_template_include',    10    );
-add_filter( 'login_redirect',          'bp_login_redirect',      10, 3 );
-add_filter( 'map_meta_cap',            'bp_map_meta_caps',       10, 4 );
+add_filter( 'request', 'bp_request', 10 );
+add_filter( 'template_include', 'bp_template_include', 10 );
+add_filter( 'login_redirect', 'bp_login_redirect', 10, 3 );
+add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
 
 // Add some filters to feedback messages.
-add_filter( 'bp_core_render_message_content', 'wptexturize'       );
-add_filter( 'bp_core_render_message_content', 'convert_smilies'   );
-add_filter( 'bp_core_render_message_content', 'convert_chars'     );
-add_filter( 'bp_core_render_message_content', 'wpautop'           );
+add_filter( 'bp_core_render_message_content', 'wptexturize' );
+add_filter( 'bp_core_render_message_content', 'convert_smilies' );
+add_filter( 'bp_core_render_message_content', 'convert_chars' );
+add_filter( 'bp_core_render_message_content', 'wpautop' );
 add_filter( 'bp_core_render_message_content', 'shortcode_unautop' );
-add_filter( 'bp_core_render_message_content', 'wp_kses_data', 5   );
+add_filter( 'bp_core_render_message_content', 'wp_kses_data', 5 );
 
 // Emails.
@@ -70 +70 @@
  * bp_template_include() works and do something similar. :)
  */
-add_filter( 'bp_template_include',   'bp_template_include_theme_supports', 2, 1 );
-add_filter( 'bp_template_include',   'bp_template_include_theme_compat',   4, 2 );
+add_filter( 'bp_template_include', 'bp_template_include_theme_supports', 2, 1 );
+add_filter( 'bp_template_include', 'bp_template_include_theme_compat', 4, 2 );
 
 // Filter BuddyPress template locations.
@@ -132 +132 @@
 
     // Bail if not the root blog.
-    if ( ! bp_is_root_blog() )
+    if ( ! bp_is_root_blog() ) {
         return $pages;
+    }
 
     $bp = buddypress();
 
-    if ( !empty( $bp->pages->activate ) )
+    if ( ! empty( $bp->pages->activate ) ) {
         $pages[] = $bp->pages->activate->id;
-
-    if ( !empty( $bp->pages->register ) )
+    }
+
+    if ( ! empty( $bp->pages->register ) ) {
         $pages[] = $bp->pages->register->id;
+    }
 
     /**
@@ -169 +172 @@
     }
 
-    if ( 'page' != $object->name ) {
+    if ( 'page' !== $object->name ) {
         return $object;
     }
 
-    $bp = buddypress();
+    $bp    = buddypress();
     $pages = array();
 
@@ -270 +273 @@
 
     // Get the WP page.
-    $page   = get_post( $item->object_id );
+    $page = get_post( $item->object_id );
 
     // See if we should add our highlight CSS classes for the page.
@@ -285 +288 @@
  *
  * @param array $comments The array of comments supplied to the comments template.
- * @param int   $post_id  The post ID.
  * @return array $comments The modified comment array.
  */
-function bp_core_filter_comments( $comments, $post_id ) {
+function bp_core_filter_comments( $comments ) {
     global $wpdb;
 
@@ -303 +305 @@
     $user_ids = implode( ',', wp_parse_id_list( $user_ids ) );
 
-    if ( ! $userdata = $wpdb->get_results( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) {
+    $userdata = $wpdb->get_results( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" );
+    if ( ! $userdata ) {
         return $comments;
     }
 
     foreach ( (array) $userdata as $user ) {
-        $users[$user->user_id] = bp_members_get_user_url( $user->user_id );
+        $users[ $user->user_id ] = bp_members_get_user_url( $user->user_id );
     }
 
     foreach ( (array) $comments as $i => $comment ) {
         if ( ! empty( $comment->user_id ) ) {
-            if ( ! empty( $users[$comment->user_id] ) ) {
-                $comments[$i]->comment_author_url = $users[$comment->user_id];
+            if ( ! empty( $users[ $comment->user_id ] ) ) {
+                $comments[ $i ]->comment_author_url = $users[ $comment->user_id ];
             }
         }
@@ -321 +324 @@
     return $comments;
 }
-add_filter( 'comments_array', 'bp_core_filter_comments', 10, 2 );
+add_filter( 'comments_array', 'bp_core_filter_comments' );
 
 /**
@@ -339 +342 @@
 
     // Only modify the redirect if we're on the main BP blog.
-    if ( !bp_is_root_blog() ) {
+    if ( ! bp_is_root_blog() ) {
         return $redirect_to;
     }
 
     // Only modify the redirect once the user is logged in.
-    if ( !is_a( $user, 'WP_User' ) ) {
+    if ( ! is_a( $user, 'WP_User' ) ) {
         return $redirect_to;
     }
@@ -369 +372 @@
     // logged-in user has any business to conduct in the Dashboard before allowing the
     // redirect to go through.
-    if ( !empty( $redirect_to ) && ( false === strpos( $redirect_to, 'wp-admin' ) || user_can( $user, 'edit_posts' ) ) ) {
+    if ( ! empty( $redirect_to ) && ( false === strpos( $redirect_to, 'wp-admin' ) || user_can( $user, 'edit_posts' ) ) ) {
         return $redirect_to;
     }
@@ -400 +403 @@
 function bp_email_plaintext_entity_decode( $retval, $prop, $transform ) {
     switch ( $prop ) {
-        case 'content_plaintext' :
-        case 'subject' :
+        case 'content_plaintext':
+        case 'subject':
             // Only decode if 'replace-tokens' is the current type.
             if ( 'replace-tokens' === $transform ) {
@@ -408 +411 @@
                 return $retval;
             }
-            break;
-
-        default :
+        default:
             return $retval;
-            break;
     }
 }
@@ -435 +435 @@
 
     // Don't touch the email when a user is registered by the site admin.
-    if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
+    if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page !== get_current_screen()->id ) {
         return $welcome_email;
     }
@@ -473 +473 @@
 
     // Don't touch the email when a user is registered by the site admin.
-    if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
+    if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page !== get_current_screen()->id ) {
         return $welcome_email;
     }
 
     // Don't touch the email if we don't have a custom registration template.
-    if ( ! bp_has_custom_signup_page() )
+    if ( ! bp_has_custom_signup_page() ) {
         return $welcome_email;
+    }
 
     // [User Set] Replaces $password in welcome email; Represents value set by user.
@@ -506 +507 @@
 function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key ) {
     $is_signup_resend = false;
-    if ( is_admin() && buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+    if ( is_admin() && buddypress()->members->admin->signups_page === get_current_screen()->id ) {
         // The admin is just approving/sending/resending the verification email.
         $is_signup_resend = true;
@@ -571 +572 @@
 
         // If the user is created from the WordPress Add User screen, don't send BuddyPress signup notifications.
-        if( in_array( get_current_screen()->id, array( 'user', 'user-network' ) ) ) {
+        if ( in_array( get_current_screen()->id, array( 'user', 'user-network' ), true ) ) {
             // If the Super Admin want to skip confirmation email.
-            if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+            if ( isset( $_POST['noconfirmation'] ) && is_super_admin() ) {
                 return false;
 
-            // WordPress will manage the signup process.
+                // WordPress will manage the signup process.
             } else {
                 return $user;
             }
 
-        // The site admin is approving/resending from the "manage signups" screen.
-        } elseif ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+            // The site admin is approving/resending from the "manage signups" screen.
+        } elseif ( buddypress()->members->admin->signups_page === get_current_screen()->id ) {
             /*
              * There can be a case where the user was created without the skip confirmation
@@ -599 +600 @@
     }
 
-    $user_id = 0;
+    $user_id     = 0;
     $user_object = get_user_by( 'login', $user );
     if ( $user_object ) {
@@ -732 +733 @@
     return apply_filters( 'bp_modify_page_title', $new_title, $title, $sep, $seplocation );
 }
-add_filter( 'wp_title',             'bp_modify_page_title', 20, 3 );
-add_filter( 'bp_modify_page_title', 'wptexturize'                 );
-add_filter( 'bp_modify_page_title', 'convert_chars'               );
-add_filter( 'bp_modify_page_title', 'esc_html'                    );
+add_filter( 'wp_title', 'bp_modify_page_title', 20, 3 );
+add_filter( 'bp_modify_page_title', 'wptexturize' );
+add_filter( 'bp_modify_page_title', 'convert_chars' );
+add_filter( 'bp_modify_page_title', 'esc_html' );
 
 /**
@@ -760 +761 @@
     // We don't need to sanitize this as WordPress will take care of it.
     $bp_title = array(
-        'title' => join( " $sep ", $bp_title_parts )
+        'title' => join( " $sep ", $bp_title_parts ),
     );
 
@@ -799 +800 @@
             $menu_item->url  = $menu_item->guid;
 
-            if ( ! in_array( array( 'bp-menu', 'bp-'. $menu_item->post_excerpt .'-nav' ), $menu_item->classes ) ) {
+            if ( ! in_array( array( 'bp-menu', 'bp-' . $menu_item->post_excerpt . '-nav' ), $menu_item->classes ) ) {
                 $menu_item->classes[] = 'bp-menu';
-                $menu_item->classes[] = 'bp-'. $menu_item->post_excerpt .'-nav';
+                $menu_item->classes[] = 'bp-' . $menu_item->post_excerpt . '-nav';
             }
         }
@@ -812 +813 @@
 
     if ( is_array( $menu_classes ) ) {
-        $menu_classes = implode( ' ', $menu_item->classes);
+        $menu_classes = implode( ' ', $menu_item->classes );
     }
 
@@ -825 +826 @@
 
     switch ( $matches[1] ) {
-        case 'login' :
+        case 'login':
             if ( is_user_logged_in() ) {
                 $menu_item->_invalid = true;
@@ -834 +835 @@
             break;
 
-        case 'logout' :
+        case 'logout':
             if ( ! is_user_logged_in() ) {
                 $menu_item->_invalid = true;
@@ -844 +845 @@
 
         // Don't show the Register link to logged-in users.
-        case 'register' :
+        case 'register':
             if ( is_user_logged_in() ) {
                 $menu_item->_invalid = true;
@@ -867 +868 @@
         $menu_item->_invalid = true;
 
-    // Highlight the current page.
+        // Highlight the current page.
     } else {
         $current = bp_get_requested_url();
@@ -930 +931 @@
  */
 function bp_customizer_nav_menus_set_item_types( $item_types = array() ) {
-    $item_types = array_merge( $item_types, array(
-        'bp_loggedin_nav' => array(
-            'title'  => _x( 'BuddyPress (logged-in)', 'customizer menu section title', 'buddypress' ),
-            'type'   => 'bp_nav',
-            'object' => 'bp_loggedin_nav',
-        ),
-        'bp_loggedout_nav' => array(
-            'title'  => _x( 'BuddyPress (logged-out)', 'customizer menu section title', 'buddypress' ),
-            'type'   => 'bp_nav',
-            'object' => 'bp_loggedout_nav',
-        ),
-    ) );
+    $item_types = array_merge(
+        $item_types,
+        array(
+            'bp_loggedin_nav'  => array(
+                'title'  => _x( 'BuddyPress (logged-in)', 'customizer menu section title', 'buddypress' ),
+                'type'   => 'bp_nav',
+                'object' => 'bp_loggedin_nav',
+            ),
+            'bp_loggedout_nav' => array(
+                'title'  => _x( 'BuddyPress (logged-out)', 'customizer menu section title', 'buddypress' ),
+                'type'   => 'bp_nav',
+                'object' => 'bp_loggedout_nav',
+            ),
+        )
+    );
 
     return $item_types;
@@ -1053 +1057 @@
         for ( $i = 0; $i < count( $quoted_matches[0] ); $i++ ) {
             $quote_pos = strpos( $q, '__QUOTE__' );
-            $q = substr_replace( $q, $quoted_matches[0][ $i ], $quote_pos, 9 );
+            $q         = substr_replace( $q, $quoted_matches[0][ $i ], $quote_pos, 9 );
         }
     }
@@ -1083 +1087 @@
  * @since 7.0.0
  *
- * @string $content Content to inject attribute into.
+ * @param string $content Content to inject attribute into.
  * @return string
  */
@@ -1091 +1095 @@
     }
 
-    $content = str_replace( '<img ',    '<img loading="lazy" ',    $content );
+    $content = str_replace( '<img ', '<img loading="lazy" ', $content );
     $content = str_replace( '<iframe ', '<iframe loading="lazy" ', $content );
 
@@ -1149 +1153 @@
     preg_match_all( '#<a[^>]+>#i', $value, $links, PREG_SET_ORDER );
     foreach ( $links as $link ) {
-        $new_link = $link = array_shift( $link );
+        $link     = array_shift( $link );
+        $new_link = $link;
 
         // Add/modify style property.
@@ -1232 +1237 @@
 
     // Default values for tokens set conditionally below.
-    $tokens['email.preheader']     = '';
-    $tokens['recipient.email']     = '';
-    $tokens['recipient.name']      = '';
-    $tokens['recipient.username']  = '';
+    $tokens['email.preheader']    = '';
+    $tokens['recipient.email']    = '';
+    $tokens['recipient.name']     = '';
+    $tokens['recipient.username'] = '';
 
     // Who is the email going to?
@@ -1305 +1310 @@
      * @param string $template Path to current template (probably single.php).
      */
-    $email_template = apply_filters( 'bp_core_render_email_template',
+    $email_template = apply_filters(
+        'bp_core_render_email_template',
         bp_locate_template( bp_email_get_template( get_queried_object() ), false ),
         $template
@@ -1315 +1321 @@
 
     ob_start();
-    include( $email_template );
+    include $email_template;
     $template = ob_get_contents();
     ob_end_clean();
@@ -1364 +1370 @@
  */
 function bp_get_post_type_link( $link = '', $post = null ) {
-    if (  'rewrites' === bp_core_get_query_parser() && 'buddypress' === get_post_type( $post ) ) {
+    if ( 'rewrites' === bp_core_get_query_parser() && 'buddypress' === get_post_type( $post ) ) {
         $bp_pages = (array) buddypress()->pages;