Changeset 13886

Timestamp:

06/01/2024 07:41:30 PM (3 months ago)

Author:

espellcaste

Message:

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

Follow-up to ​13883.

See #9164 and #7228

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-optouts.php (modified) (21 diffs)
• admin/bp-core-admin-rewrites.php (modified) (6 diffs)
• admin/bp-core-admin-schema.php (modified) (14 diffs)
• admin/bp-core-admin-settings.php (modified) (38 diffs)
• admin/bp-core-admin-slugs.php (modified) (1 diff)
• admin/bp-core-admin-tools.php (modified) (27 diffs)
• bp-core-options.php (modified) (2 diffs)

trunk/src/bp-core/admin/bp-core-admin-optouts.php

@@ -20 +20 @@
  * @since 8.0.0
  *
- * @global $bp_optouts_list_table
+ * @global $bp_optouts_list_table BP_Optouts_List_Table List table instance for nonmember opt-outs admin page.
  */
 function bp_core_optouts_admin_load() {
@@ -26 +26 @@
 
     // Build redirection URL.
-    $redirect_to = remove_query_arg( array( 'action', 'error', 'updated', 'activated', 'notactivated', 'deleted', 'notdeleted', 'resent', 'notresent', 'do_delete', 'do_resend', 'do_activate', '_wpnonce', 'signup_ids' ), $_SERVER['REQUEST_URI'] );
-    $doaction    = bp_admin_list_table_current_bulk_action();
+    $redirect_to = remove_query_arg(
+        array(
+            'action',
+            'error',
+            'updated',
+            'activated',
+            'notactivated',
+            'deleted',
+            'notdeleted',
+            'resent',
+            'notresent',
+            'do_delete',
+            'do_resend',
+            'do_activate',
+            '_wpnonce',
+            'signup_ids',
+        ),
+        $_SERVER['REQUEST_URI']
+    );
+
+    $doaction = bp_admin_list_table_current_bulk_action();
 
     /**
@@ -46 +65 @@
      * @param array $value Array of allowed actions to use.
      */
-    $allowed_actions = apply_filters( 'bp_optouts_admin_allowed_actions', array( 'do_delete',  'do_resend' ) );
-
-    if ( ! in_array( $doaction, $allowed_actions ) || ( -1 == $doaction ) ) {
-
-        require_once( ABSPATH . 'wp-admin/includes/class-wp-users-list-table.php' );
+    $allowed_actions = apply_filters( 'bp_optouts_admin_allowed_actions', array( 'do_delete', 'do_resend' ) );
+
+    if ( ! in_array( $doaction, $allowed_actions, true ) || ( -1 === $doaction ) ) {
+
+        require_once ABSPATH . 'wp-admin/includes/class-wp-users-list-table.php';
         $bp_optouts_list_table = new BP_Optouts_List_Table();
 
@@ -101 +120 @@
 
     } else {
-        if ( empty( $_REQUEST['optout_ids' ] ) ) {
+        if ( empty( $_REQUEST['optout_ids'] ) ) {
             return;
         }
-        $optout_ids = wp_parse_id_list( $_REQUEST['optout_ids' ] );
+        $optout_ids = wp_parse_id_list( $_REQUEST['optout_ids'] );
 
         // Handle optout deletion.
-        if ( 'do_delete' == $doaction ) {
+        if ( 'do_delete' === $doaction ) {
 
             // Nonce check.
@@ -115 +134 @@
             foreach ( $optout_ids as $optout_id ) {
                 if ( bp_delete_optout_by_id( $optout_id ) ) {
-                    $success++;
+                    ++$success;
                 }
             }
@@ -134 +153 @@
             bp_core_redirect( $redirect_to );
 
-        // Plugins can update other stuff from here.
+            // Plugins can update other stuff from here.
         } else {
 
@@ -153 +172 @@
     }
 }
-add_action( "load-tools_page_bp-optouts", 'bp_core_optouts_admin_load' );
+add_action( 'load-tools_page_bp-optouts', 'bp_core_optouts_admin_load' );
 
 /**
@@ -171 +190 @@
         $notice = array(
             'class'   => 'updated',
-            'message' => ''
+            'message' => '',
         );
 
@@ -177 +196 @@
             $deleted            = absint( $_REQUEST['deleted'] );
             $notice['message'] .= sprintf(
+                /* translators: %s: number of deleted optouts */
                 _nx(
-                    /* translators: %s: number of deleted optouts */
-                    '%s opt-out successfully deleted!', '%s opt-outs successfully deleted!',
+                    '%s opt-out successfully deleted!',
+                    '%s opt-outs successfully deleted!',
                     $deleted,
                     'nonmembers opt-out deleted',
@@ -191 +211 @@
             $notdeleted         = absint( $_REQUEST['notdeleted'] );
             $notice['message'] .= sprintf(
+                /* translators: %s: number of optouts that failed to be deleted */
                 _nx(
-                    /* translators: %s: number of optouts that failed to be deleted */
-                    '%s opt-out was not deleted.', '%s opt-outs were not deleted.',
+                    '%s opt-out was not deleted.',
+                    '%s opt-outs were not deleted.',
                     $notdeleted,
                     'nonmembers opt-out not deleted',
@@ -241 +262 @@
             <div id="message" class="<?php echo esc_attr( $notice['class'] ); ?> notice is-dismissible">
 
-        <?php else: ?>
+        <?php else : ?>
 
             <div class="<?php echo esc_attr( $notice['class'] ); ?> notice is-dismissible">
@@ -250 +271 @@
         </div>
 
-    <?php endif;
+        <?php
+    endif;
 
     // Show the proper screen.
     switch ( $doaction ) {
-        case 'delete' :
+        case 'delete':
             bp_core_optouts_admin_manage( $doaction );
             break;
@@ -270 +292 @@
  *
  * @global $plugin_page
- * @global $bp_optouts_list_table
+ * @global $bp_optouts_list_table BP_Optouts_List_Table List table instance for nonmember opt-outs admin page.
  */
 function bp_core_optouts_admin_index() {
@@ -312 +334 @@
             'action2',
             '_wpnonce',
-            'optout_ids'
+            'optout_ids',
         ),
         $_SERVER['REQUEST_URI']
@@ -341 +363 @@
         <?php $bp_optouts_list_table->views(); ?>
 
-        <form id="bp-optouts-search-form" action="<?php echo esc_url( $search_form_url ) ;?>">
+        <form id="bp-optouts-search-form" action="<?php echo esc_url( $search_form_url ); ?>">
             <input type="hidden" name="page" value="<?php echo esc_attr( $plugin_page ); ?>" />
             <?php $bp_optouts_list_table->search_box( esc_html__( 'Search for a specific email address', 'buddypress' ), 'bp-optouts' ); ?>
         </form>
 
-        <form id="bp-optouts-form" action="<?php echo esc_url( $form_url );?>" method="post">
+        <form id="bp-optouts-form" action="<?php echo esc_url( $form_url ); ?>" method="post">
             <?php $bp_optouts_list_table->display(); ?>
         </form>
     </div>
-<?php
+    <?php
 }
 
@@ -381 +403 @@
 
     // Query for matching optouts, and filter out bad IDs.
-    $args = array(
-        'id'     => $ids,
+    $args       = array(
+        'id' => $ids,
     );
     $optouts    = bp_get_optouts( $args );
@@ -389 +411 @@
     // Check optout IDs and set up strings.
     switch ( $action ) {
-        case 'delete' :
+        case 'delete':
             if ( 0 === count( $optouts ) ) {
                 $helper_text = __( 'No opt-out requests were found.', 'buddypress' );
@@ -404 +426 @@
     $action_args = array(
         'action'     => 'do_' . $action,
-        'optout_ids' => implode( ',', $optout_ids )
+        'optout_ids' => implode( ',', $optout_ids ),
     );
 
@@ -430 +452 @@
 
         <ol class="bp-optouts-list">
-        <?php foreach ( $optouts as $optout ) : ?>
+        <?php foreach ( $optouts as $optout ) : ?>
 
             <li>
-                <strong><?php echo esc_html( $optout->email_address ) ?></strong>
+                <strong><?php echo esc_html( $optout->email_address ); ?></strong>
                 <p class="description">
                     <?php
                     $last_modified = mysql2date( 'Y/m/d g:i:s a', $optout->date_modified );
                     /* translators: %s: modification date */
-                    printf( esc_html__( 'Date modified: %s', 'buddypress'), esc_html( $last_modified ) );
+                    printf( esc_html__( 'Date modified: %s', 'buddypress' ), esc_html( $last_modified ) );
                     ?>
                 </p>
@@ -448 +470 @@
         <?php if ( 'delete' === $action && count( $optouts ) ) : ?>
 
-            <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
-
-        <?php endif ; ?>
+            <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ); ?></strong></p>
+
+        <?php endif; ?>
 
         <?php if ( count( $optouts ) ) : ?>
@@ -458 +480 @@
         <?php endif; ?>
 
-        <a class="button" href="<?php echo esc_url( $cancel_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ) ?></a>
+        <a class="button" href="<?php echo esc_url( $cancel_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ); ?></a>
     </div>
 

trunk/src/bp-core/admin/bp-core-admin-rewrites.php

@@ -45 +45 @@
         }
 
-        $directory_pages     = (array) bp_core_get_directory_pages();
+        $dir_pages_object    = bp_core_get_directory_pages();
+        $directory_pages     = (array) $dir_pages_object;
         $current_page_slugs  = wp_list_pluck( $directory_pages, 'slug', 'id' );
         $current_page_titles = wp_list_pluck( $directory_pages, 'title', 'id' );
@@ -80 +81 @@
 
             if ( isset( $posted_data['_bp_component_slugs'] ) && is_array( $posted_data['_bp_component_slugs'] ) ) {
-                $postarr['meta_input']['_bp_component_slugs'] = array_map( 'sanitize_title', $posted_data['_bp_component_slugs'] );
+                $postarr['meta_input']['_bp_component_slugs'] = array_map( 'sanitize_title', (array) $posted_data['_bp_component_slugs'] );
             }
 
@@ -87 +88 @@
                 $current_group_create_custom_slug = '';
 
-                if ( isset( $directory_pages->groups->custom_slugs['bp_group_create'] ) ) {
-                    $current_group_create_custom_slug = $directory_pages->groups->custom_slugs['bp_group_create'];
+                if ( isset( $dir_pages_object->groups->custom_slugs['bp_group_create'] ) ) {
+                    $current_group_create_custom_slug = $dir_pages_object->groups->custom_slugs['bp_group_create'];
                 }
 
@@ -261 +262 @@
                                                                     'slug'       => 'group',
                                                                     'rewrite_id' => $edit_subnav['rewrite_id'] . '_group',
-                                                                )
+                                                                ),
                                                             )
                                                         );
@@ -268 +269 @@
 
                                                 $members_sub_navigation[ $navs['main_nav']['slug'] ] = array(
-                                                    'name'    => $navs['main_nav']['name'],
+                                                    'name' => $navs['main_nav']['name'],
                                                     'sub_nav' => $navs['sub_nav'],
                                                 );
                                             }
-                                        ?>
+                                            ?>
                                         <tr>
                                             <th scope="row">
@@ -286 +287 @@
                                             </th>
                                             <td>
-                                                <input type="text" class="code" name="<?php printf( 'components[%1$d][_bp_component_slugs][%2$s]', absint( $directory_data->id ), esc_attr( $navs['main_nav']['rewrite_id'] ) ); ?>" id="<?php echo esc_attr( sprintf( '%s-slug', sanitize_key( $navs['main_nav']['rewrite_id'] ) ) ); ?>" value="<?php echo esc_attr( bp_rewrites_get_slug( $component_id, $navs['main_nav']['rewrite_id'],  $navs['main_nav']['slug'] ) ); ?>">
+                                                <input type="text" class="code" name="<?php printf( 'components[%1$d][_bp_component_slugs][%2$s]', absint( $directory_data->id ), esc_attr( $navs['main_nav']['rewrite_id'] ) ); ?>" id="<?php echo esc_attr( sprintf( '%s-slug', sanitize_key( $navs['main_nav']['rewrite_id'] ) ) ); ?>" value="<?php echo esc_attr( bp_rewrites_get_slug( $component_id, $navs['main_nav']['rewrite_id'], $navs['main_nav']['slug'] ) ); ?>">
                                             </td>
                                         </tr>

trunk/src/bp-core/admin/bp-core-admin-schema.php

@@ -22 +22 @@
  */
 function bp_core_install( $active_components = false ) {
-
     bp_pre_schema_upgrade();
 
@@ -45 +44 @@
 
     // Notifications.
-    if ( !empty( $active_components['notifications'] ) ) {
+    if ( ! empty( $active_components['notifications'] ) ) {
         bp_core_install_notifications();
     }
 
     // Friend Connections.
-    if ( !empty( $active_components['friends'] ) ) {
+    if ( ! empty( $active_components['friends'] ) ) {
         bp_core_install_friends();
     }
 
     // Extensible Groups.
-    if ( !empty( $active_components['groups'] ) ) {
+    if ( ! empty( $active_components['groups'] ) ) {
         bp_core_install_groups();
     }
 
     // Private Messaging.
-    if ( !empty( $active_components['messages'] ) ) {
+    if ( ! empty( $active_components['messages'] ) ) {
         bp_core_install_private_messaging();
     }
 
     // Extended Profiles.
-    if ( !empty( $active_components['xprofile'] ) ) {
+    if ( ! empty( $active_components['xprofile'] ) ) {
         bp_core_install_extended_profiles();
     }
 
     // Blog tracking.
-    if ( !empty( $active_components['blogs'] ) ) {
+    if ( ! empty( $active_components['blogs'] ) ) {
         bp_core_install_blog_tracking();
     }
@@ -79 +78 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_notifications() {
@@ -120 +118 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_activity_streams() {
@@ -170 +167 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_friends() {
@@ -195 +191 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_groups() {
@@ -254 +249 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_private_messaging() {
@@ -312 +306 @@
  * @since 1.0.0
  *
+ * @global wpdb $wpdb WordPress database object.
  */
 function bp_core_install_extended_profiles() {
@@ -404 +399 @@
  *
  * @since 1.0.0
- *
  */
 function bp_core_install_blog_tracking() {
@@ -444 +438 @@
 
     // Signups is not there and we need it so let's create it.
-    require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
-    require_once( ABSPATH                  . 'wp-admin/includes/upgrade.php'     );
+    require_once buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php';
+    require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
     // Never use bp_core_get_table_prefix() for any global users tables.
@@ -459 +453 @@
     // Filter out all the queries except wp_signups.
     foreach ( $create_queries as $key => $query ) {
-        if ( preg_match( "|CREATE TABLE ([^ ]*)|", $query, $matches ) ) {
+        if ( preg_match( '|CREATE TABLE ([^ ]*)|', $query, $matches ) ) {
             if ( trim( $matches[1], '`' ) !== $wpdb->signups ) {
                 unset( $create_queries[ $key ] );
@@ -540 +534 @@
         foreach ( $tt_ids as $tt_id ) {
             $term = get_term_by( 'term_taxonomy_id', (int) $tt_id, bp_get_email_tax_type() );
-            wp_update_term( (int) $term->term_id, bp_get_email_tax_type(), array(
-                'description' => $descriptions[ $id ],
-            ) );
+            wp_update_term(
+                (int) $term->term_id,
+                bp_get_email_tax_type(),
+                array(
+                    'description' => $descriptions[ $id ],
+                )
+            );
         }
     }
@@ -569 +567 @@
     $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
     $bp_prefix       = bp_core_get_table_prefix();
-    $sql[] = "CREATE TABLE {$bp_prefix}bp_invitations (
+    $sql[]           = "CREATE TABLE {$bp_prefix}bp_invitations (
         id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
         user_id bigint(20) NOT NULL,
@@ -616 +614 @@
     $optouts_class   = new BP_Optout();
     $table_name      = $optouts_class->get_table_name();
-    $sql = "CREATE TABLE {$table_name} (
+    $sql             = "CREATE TABLE {$table_name} (
         id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
         email_address_hash varchar(255) NOT NULL,

trunk/src/bp-core/admin/bp-core-admin-settings.php

@@ -14 +14 @@
  * Main settings section description for the settings page.
  *
- * @since 1.6.0
- */
-function bp_admin_setting_callback_main_section() { }
+ * @internal This function is used as a callback for the 'bp_main_section' settings section.
+ *
+ * @since 1.6.0
+ */
+function bp_admin_setting_callback_main_section() {}
 
 /**
@@ -22 +24 @@
  *
  * @since 1.6.0
- *
  */
 function bp_admin_setting_callback_admin_bar() {
-?>
-
-    <input id="hide-loggedout-adminbar" name="hide-loggedout-adminbar" type="checkbox" value="1" <?php checked( !bp_hide_loggedout_adminbar( false ) ); ?> />
+    ?>
+
+    <input id="hide-loggedout-adminbar" name="hide-loggedout-adminbar" type="checkbox" value="1" <?php checked( ! bp_hide_loggedout_adminbar( false ) ); ?> />
     <label for="hide-loggedout-adminbar"><?php esc_html_e( 'Show the Toolbar for logged out users', 'buddypress' ); ?></label>
 
-<?php
+    <?php
 }
 
@@ -40 +41 @@
 function bp_admin_setting_callback_community_visibility() {
     $visibility = bp_get_community_visibility( 'all' );
-?>
+    ?>
     <select name="_bp_community_visibility[global]" id="_bp_community_visibility-global" aria-describedby="_bp_community_visibility_description" autocomplete="off">
         <option value="anyone" <?php echo selected( $visibility['global'], 'anyone' ); ?>><?php esc_html_e( 'Anyone', 'buddypress' ); ?></option>
@@ -47 +48 @@
 
     <p id="_bp_community_visibility_description" class="description"><?php esc_html_e( 'Choose "Anyone" to allow any visitor access to your community area. Choose "Members Only" to restrict access to your community area to logged-in members only.', 'buddypress' ); ?></p>
-<?php
+    <?php
 }
 
@@ -56 +57 @@
  *
  * @param mixed $saved_value The value passed to the save function.
+ * @return array
  */
 function bp_admin_sanitize_callback_community_visibility( $saved_value ) {
@@ -91 +93 @@
  */
 function bp_admin_setting_callback_theme_package_id() {
-    $options = '';
+    $options    = '';
+    $package_id = bp_get_theme_package_id();
 
     /*
@@ -104 +107 @@
             '<option value="%1$s" %2$s>%3$s</option>',
             esc_attr( $id ),
-            selected( $theme->id, bp_get_theme_package_id(), false ),
+            selected( $theme->id, $package_id, false ),
             esc_html( $theme->name )
         );
@@ -110 +113 @@
 
     // phpcs:disable WordPress.Security.EscapeOutput
-    if ( $options ) : ?>
+    if ( $options ) :
+        ?>
         <select name="_bp_theme_package_id" id="_bp_theme_package_id" aria-describedby="_bp_theme_package_description"><?php echo $options; ?></select>
         <p id="_bp_theme_package_description" class="description"><?php esc_html_e( 'The selected Template Pack will serve all BuddyPress templates.', 'buddypress' ); ?></p>
@@ -117 +121 @@
         <p><?php esc_html_e( 'No template packages available.', 'buddypress' ); ?></p>
 
-    <?php endif;
+        <?php
+    endif;
     // phpcs:enable
 }
@@ -126 +131 @@
  * Groups settings section description for the settings page.
  *
- * @since 1.6.0
- */
-function bp_admin_setting_callback_activity_section() { }
+ * @internal This function is used as a callback for the 'bp_activity_section' settings section.
+ *
+ * @since 1.6.0
+ */
+function bp_admin_setting_callback_activity_section() {}
 
 /**
@@ -134 +141 @@
  *
  * @since 1.6.0
- *
  */
 function bp_admin_setting_callback_activity_akismet() {
-?>
-
+    ?>
     <input id="_bp_enable_akismet" name="_bp_enable_akismet" type="checkbox" value="1" <?php checked( bp_is_akismet_active( true ) ); ?> />
     <label for="_bp_enable_akismet"><?php esc_html_e( 'Allow Akismet to scan for activity stream spam', 'buddypress' ); ?></label>
-
-<?php
+    <?php
 }
 
@@ -152 +156 @@
 function bp_admin_setting_callback_blogforum_comments() {
     $support = post_type_supports( 'post', 'buddypress-activity' );
-?>
+    ?>
 
     <input id="bp-disable-blogforum-comments" name="bp-disable-blogforum-comments" type="checkbox" value="1" <?php checked( ! bp_disable_blogforum_comments( false ) ); ?> <?php disabled( ! $support ); ?> />
@@ -160 +164 @@
     <?php endif; ?>
 
-<?php
+    <?php
 }
 
@@ -169 +173 @@
  */
 function bp_admin_setting_callback_heartbeat() {
-?>
-
+    ?>
     <input id="_bp_enable_heartbeat_refresh" name="_bp_enable_heartbeat_refresh" type="checkbox" value="1" <?php checked( bp_is_activity_heartbeat_active( true ) ); ?> />
     <label for="_bp_enable_heartbeat_refresh"><?php esc_html_e( 'Automatically check for new items while viewing the activity stream', 'buddypress' ); ?></label>
-
-<?php
+    <?php
 }
 
@@ -187 +189 @@
  *
  * @param bool $value Whether or not to sanitize.
- * @return bool
+ * @return int
  */
 function bp_admin_sanitize_callback_blogforum_comments( $value = false ) {
@@ -198 +200 @@
  * Profile settings section description for the settings page.
  *
- * @since 1.6.0
- */
-function bp_admin_setting_callback_members_section() { }
+ * @internal This function is used as a callback for the 'bp_members_section' settings section.
+ *
+ * @since 1.6.0
+ */
+function bp_admin_setting_callback_members_section() {}
 
 /**
@@ -209 +213 @@
  */
 function bp_admin_setting_callback_avatar_uploads() {
-?>
+    ?>
     <input id="bp-disable-avatar-uploads" name="bp-disable-avatar-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_avatar_uploads( false ) ); ?> />
     <label for="bp-disable-avatar-uploads"><?php esc_html_e( 'Allow registered members to upload avatars', 'buddypress' ); ?></label>
-<?php
+    <?php
 }
 
@@ -222 +226 @@
  */
 function bp_admin_setting_callback_cover_image_uploads() {
-?>
+    ?>
     <input id="bp-disable-cover-image-uploads" name="bp-disable-cover-image-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_cover_image_uploads() ); ?> />
     <label for="bp-disable-cover-image-uploads"><?php esc_html_e( 'Allow registered members to upload cover images', 'buddypress' ); ?></label>
-<?php
+    <?php
 }
 
@@ -234 +238 @@
  */
 function bp_admin_setting_callback_members_invitations() {
-?>
+    ?>
     <input id="bp-enable-members-invitations" name="bp-enable-members-invitations" type="checkbox" value="1" <?php checked( bp_get_members_invitations_allowed() ); ?> />
     <label for="bp-enable-members-invitations"><?php esc_html_e( 'Allow registered members to invite people to join this network', 'buddypress' ); ?></label>
@@ -255 +259 @@
  */
 function bp_admin_setting_callback_membership_requests() {
-?>
+    ?>
     <input id="bp-enable-membership-requests" name="bp-enable-membership-requests" type="checkbox" value="1" <?php checked( bp_get_membership_requests_required( 'raw' ) ); ?> <?php disabled( bp_get_signup_allowed() ); ?> />
     <label for="bp-enable-membership-requests"><?php esc_html_e( 'Allow visitors to request site membership. If enabled, an administrator must approve each new site membership request.', 'buddypress' ); ?></label>
@@ -262 +266 @@
             <p class="description"><?php esc_html_e( 'With a WP multisite setup, to require membership requests for new signups, choose one of the following two options from the Network Settings > Registration Settings pane:', 'buddypress' ); ?><p>
                 <ul>
-                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests but not allow site creation requests, select "Registration is disabled".', 'buddypress' ) ?></p></li>
-                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests and to allow new sites to be created by your users, choose "Logged in users may register new sites".', 'buddypress' ) ?></p></li>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests but not allow site creation requests, select "Registration is disabled".', 'buddypress' ); ?></p></li>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests and to allow new sites to be created by your users, choose "Logged in users may register new sites".', 'buddypress' ); ?></p></li>
                 </ul>
             <p class="description"><?php esc_html_e( 'The other two options, "User accounts may be registered" and "Both sites and user accounts can be registered," are open in nature and membership requests will not be enabled if one of those options is selected.', 'buddypress' ); ?><p>
@@ -284 +288 @@
  * Profile settings section description for the settings page.
  *
- * @since 1.6.0
- */
-function bp_admin_setting_callback_xprofile_section() { }
+ * @internal This function is used as a callback for the 'bp_xprofile_section' settings section.
+ *
+ * @since 1.6.0
+ */
+function bp_admin_setting_callback_xprofile_section() {}
 
 /**
@@ -292 +298 @@
  *
  * @since 1.6.0
- *
  */
 function bp_admin_setting_callback_profile_sync() {
-?>
-
-    <input id="bp-disable-profile-sync" name="bp-disable-profile-sync" type="checkbox" value="1" <?php checked( !bp_disable_profile_sync( false ) ); ?> />
+    ?>
+    <input id="bp-disable-profile-sync" name="bp-disable-profile-sync" type="checkbox" value="1" <?php checked( ! bp_disable_profile_sync( false ) ); ?> />
     <label for="bp-disable-profile-sync"><?php esc_html_e( 'Enable BuddyPress to WordPress profile syncing', 'buddypress' ); ?></label>
-
-<?php
+    <?php
 }
 
@@ -308 +311 @@
  * Groups settings section description for the settings page.
  *
- * @since 1.6.0
- */
-function bp_admin_setting_callback_groups_section() { }
+ * @internal This function is used as a callback for the 'bp_groups_section' settings section.
+ *
+ * @since 1.6.0
+ */
+function bp_admin_setting_callback_groups_section() {}
 
 /**
@@ -316 +321 @@
  *
  * @since 1.6.0
- *
  */
 function bp_admin_setting_callback_group_creation() {
-?>
-
-    <input id="bp_restrict_group_creation" name="bp_restrict_group_creation" type="checkbox" aria-describedby="bp_group_creation_description" value="1" <?php checked( !bp_restrict_group_creation( false ) ); ?> />
+    ?>
+    <input id="bp_restrict_group_creation" name="bp_restrict_group_creation" type="checkbox" aria-describedby="bp_group_creation_description" value="1" <?php checked( ! bp_restrict_group_creation( false ) ); ?> />
     <label for="bp_restrict_group_creation"><?php esc_html_e( 'Enable group creation for all users', 'buddypress' ); ?></label>
     <p class="description" id="bp_group_creation_description"><?php esc_html_e( 'Administrators can always create groups, regardless of this setting.', 'buddypress' ); ?></p>
-
-<?php
+    <?php
 }
 
@@ -334 +336 @@
  */
 function bp_admin_setting_callback_group_avatar_uploads() {
-?>
+    ?>
     <input id="bp-disable-group-avatar-uploads" name="bp-disable-group-avatar-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_group_avatar_uploads() ); ?> />
     <label for="bp-disable-group-avatar-uploads"><?php esc_html_e( 'Allow customizable avatars for groups', 'buddypress' ); ?></label>
-<?php
+    <?php
 }
 
@@ -346 +348 @@
  */
 function bp_admin_setting_callback_group_cover_image_uploads() {
-?>
+    ?>
     <input id="bp-disable-group-cover-image-uploads" name="bp-disable-group-cover-image-uploads" type="checkbox" value="1" <?php checked( ! bp_disable_group_cover_image_uploads() ); ?> />
     <label for="bp-disable-group-cover-image-uploads"><?php esc_html_e( 'Allow customizable cover images for groups', 'buddypress' ); ?></label>
-<?php
+    <?php
 }
 
@@ -358 +360 @@
  */
 function bp_admin_setting_callback_group_activity_deletions() {
-?>
+    ?>
     <input id="bp-disable-group-activity-deletions" name="bp-disable-group-activity-deletions" type="checkbox" value="1" <?php checked( ! bp_disable_group_activity_deletions() ); ?> />
     <label for="bp-disable-group-activity-deletions"><?php esc_html_e( "Allow group administrators and moderators to delete activity items from their group's activity stream", 'buddypress' ); ?></label>
-<?php
+    <?php
 }
 
@@ -369 +371 @@
  * Account settings section description for the settings page.
  *
+ * @internal This function is used as a callback for the 'bp_account_section' settings section.
+ *
  * @since 12.0.0
  */
-function bp_admin_setting_callback_settings_section() { }
+function bp_admin_setting_callback_settings_section() {}
 
 /**
@@ -379 +383 @@
  */
 function bp_admin_setting_callback_account_deletion() {
-?>
-
+    ?>
     <input id="bp-disable-account-deletion" name="bp-disable-account-deletion" type="checkbox" value="1" <?php checked( ! bp_disable_account_deletion( false ) ); ?> />
     <label for="bp-disable-account-deletion"><?php esc_html_e( 'Allow registered members to delete their own accounts', 'buddypress' ); ?></label>
-
-<?php
+    <?php
 }
 
@@ -393 +395 @@
  *
  * @since 1.6.0
- *
  */
 function bp_core_admin_settings() {
@@ -403 +404 @@
 
     <div class="buddypress-body">
-        <form action="<?php echo esc_url( $form_action ) ?>" method="post">
+        <form action="<?php echo esc_url( $form_action ); ?>" method="post">
 
             <?php settings_fields( 'buddypress' ); ?>
@@ -415 +416 @@
     </div>
 
-<?php
+    <?php
 }
 
@@ -426 +427 @@
     global $wp_settings_fields;
 
-    if ( isset( $_GET['page'] ) && 'bp-settings' == $_GET['page'] && !empty( $_POST['submit'] ) ) {
+    if ( isset( $_GET['page'] ) && 'bp-settings' === $_GET['page'] && ! empty( $_POST['submit'] ) ) {
         check_admin_referer( 'buddypress-options' );
 
@@ -434 +435 @@
             foreach ( (array) $wp_settings_fields['buddypress'] as $section => $settings ) {
                 foreach ( $settings as $setting_name => $setting ) {
-                    $value = isset( $_POST[$setting_name] ) ? $_POST[$setting_name] : '';
+                    $value = isset( $_POST[ $setting_name ] ) ? $_POST[ $setting_name ] : '';
 
                     bp_update_option( $setting_name, $value );
@@ -459 +460 @@
             // Ie, the Profile Syncing option reads "Enable Sync", so when it's checked,
             // the corresponding option should be unset.
-            $value = isset( $_POST[$legacy_option] ) ? '' : 1;
+            $value = isset( $_POST[ $legacy_option ] ) ? '' : 1;
             bp_update_option( $legacy_option, $value );
         }
 
-        bp_core_redirect( add_query_arg( array( 'page' => 'bp-settings', 'updated' => 'true' ), bp_get_admin_url( 'admin.php' ) ) );
+        bp_core_redirect(
+            add_query_arg(
+                array(
+                    'page'    => 'bp-settings',
+                    'updated' => 'true',
+                ),
+                bp_get_admin_url( 'admin.php' )
+            )
+        );
     }
 }
@@ -473 +482 @@
  * @since 1.6.0
  *
- * @param string $option  Form option to echo.
- * @param string $default Form option default.
- * @param bool   $slug    Form option slug.
- */
-function bp_form_option( $option, $default = '' , $slug = false ) {
+ * @param string $option         Form option to echo.
+ * @param string $default_option Form option default.
+ * @param bool   $slug           Form option slug.
+ */
+function bp_form_option( $option, $default_option = '', $slug = false ) {
     // phpcs:ignore WordPress.Security.EscapeOutput
-    echo bp_get_form_option( $option, $default, $slug );
-}
-
-/**
- * Return settings API option
- *
- * @since 1.6.0
- *
- *
- * @param string $option  Form option to return.
- * @param string $default Form option default.
- * @param bool   $slug    Form option slug.
+    echo bp_get_form_option( $option, $default_option, $slug );
+}
+
+/**
+ * Return settings API option.
+ *
+ * @since 1.6.0
+ *
+ * @param string $option         Form option to return.
+ * @param string $default_option Optional. Form option default. Default is empty string.
+ * @param bool   $slug           Optional. Form option slug. Default is false.
  * @return string
  */
-function bp_get_form_option( $option, $default = '', $slug = false ) {
+function bp_get_form_option( $option, $default_option = '', $slug = false ) {
 
     // Get the option and sanitize it.
-    $value = bp_get_option( $option, $default );
+    $value = bp_get_option( $option, $default_option );
 
     // Slug?
     if ( true === $slug ) {
-
         /**
          * Filters the slug value in the form field.
@@ -507 +514 @@
          *
          * @param string $value Value being returned for the requested option.
+         * @param string $option Option whose value is being requested.
          */
-        $value = esc_attr( apply_filters( 'editable_slug', $value ) );
-    } else { // Not a slug.
-        $value = esc_attr( $value );
+        $value = apply_filters( 'editable_slug', $value, $option );
     }
 
     // Fallback to default.
     if ( empty( $value ) ) {
-        $value = $default;
+        $value = $default_option;
     }
+
+    $value = esc_attr( $value );
 
     /**

trunk/src/bp-core/admin/bp-core-admin-slugs.php

@@ -12 +12 @@
 defined( 'ABSPATH' ) || exit;
 
-_deprecated_file( basename( __FILE__ ), '12.0.0', '', esc_html__( 'BuddyPress does not use page association anymore, you can restore it using the BP Classic plugin', 'buddypress' ) );
+_deprecated_file(
+    basename( __FILE__ ),
+    '12.0.0',
+    '',
+    esc_html__( 'BuddyPress does not use page association anymore, you can restore it using the BP Classic plugin', 'buddypress' )
+);

trunk/src/bp-core/admin/bp-core-admin-tools.php

@@ -264 +264 @@
  * @since 2.0.0
  *
+ * @global wpdb $wpdb WordPress database object.
+ *
  * @return array
  */
@@ -270 +272 @@
 
     if ( ! bp_is_active( 'friends' ) ) {
-        return;
+        return array( 2, __( 'Friends component is not active.', 'buddypress' ) );
     }
 
@@ -290 +292 @@
     if ( $total_users > 0 ) {
         $per_query = 500;
-        $offset = 0;
+        $offset    = 0;
         while ( $offset < $total_users ) {
             // Only bother updating counts for users who actually have friendships.
@@ -323 +325 @@
  * @since 2.0.0
  *
+ * @global wpdb $wpdb WordPress database object.
+ *
  * @return array
  */
@@ -329 +333 @@
 
     if ( ! bp_is_active( 'groups' ) ) {
-        return;
+        return array( 2, __( 'Groups component is not active.', 'buddypress' ) );
     }
 
@@ -348 +352 @@
     if ( $total_users > 0 ) {
         $per_query = 500;
-        $offset = 0;
+        $offset    = 0;
         while ( $offset < $total_users ) {
             // But only bother to update counts for users that have groups.
@@ -379 +383 @@
 
     // Default to failure text.
-    $result    = __( 'Failed!',   'buddypress' );
+    $result = __( 'Failed!', 'buddypress' );
 
     // Default to unrepaired.
-    $repair    = false;
+    $repair = false;
 
     // Run function if blogs component is active.
@@ -412 +416 @@
     if ( ! is_multisite() ) {
         return array( 0, sprintf( $statement, __( 'Failed!', 'buddypress' ) ) );
-    }
+    }
 
     // Run function if blogs component is active.
@@ -459 +463 @@
  *
  * @since 2.0.0
+ *
+ * @return array
  */
 function bp_admin_repair_count_members() {
@@ -474 +480 @@
  * @since 6.0.0
  *
+ * @global wpdb $wpdb WordPress database object.
+ *
  * @return array
  */
@@ -479 +487 @@
     global $wpdb;
 
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-    require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
+    require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+    require_once buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php';
 
     /* translators: %s: the result of the action performed by the repair tool */
@@ -490 +498 @@
     // Check for existence of invitations table.
     $table_name = BP_Invitation_Manager::get_table_name();
-    $query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
-    if ( ! $wpdb->get_var( $query ) == $table_name ) {
+    $query      = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
+    if ( ! $wpdb->get_var( $query ) === $table_name ) {
         // Early return if table creation failed.
         return array( 2, sprintf( $statement, $result ) );
@@ -512 +520 @@
         if ( empty( $records ) ) {
             $migrate_result = __( 'Migrated invitations!', 'buddypress' );
-            return array( 0, sprintf( $statement . ' ' . $migrate_statement , $result, $migrate_result ) );
+            return array( 0, sprintf( $statement . ' ' . $migrate_statement, $result, $migrate_result ) );
         } else {
-            return array( 2, sprintf( $statement . ' ' . $migrate_statement , $result, $migrate_result ) );
+            return array( 2, sprintf( $statement . ' ' . $migrate_statement, $result, $migrate_result ) );
         }
     }
@@ -527 +535 @@
  * @since 2.0.0
  *
- * @param string      $message Feedback message.
- * @param string|bool $class   Unused.
+ * @param string      $message    Feedback message.
+ * @param string|bool $html_class Unused. Defaults to false.
  * @return false|Closure
  */
-function bp_admin_tools_feedback( $message, $class = false ) {
+function bp_admin_tools_feedback( $message, $html_class = false ) {
+    $class = $html_class;
     if ( is_string( $message ) ) {
         $message = '<p>' . $message . '</p>';
-        $class = $class ? $class : 'updated';
+        $class   = $class ? $class : 'updated';
     } elseif ( is_wp_error( $message ) ) {
         $errors = $message->get_error_messages();
@@ -566 +575 @@
                 'li'  => true,
                 'div' => array(
-                    'id' => true,
+                    'id'    => true,
                     'class' => true,
                 ),
@@ -592 +601 @@
     ?>
     <div class="wrap">
-        <h1 class="wp-heading-inline"><?php esc_html_e( 'Tools', 'buddypress' ) ?></h1>
+        <h1 class="wp-heading-inline"><?php esc_html_e( 'Tools', 'buddypress' ); ?></h1>
         <hr class="wp-header-end">
 
@@ -602 +611 @@
          * @since 2.0.0
          */
-        do_action( 'bp_network_tool_box' ); ?>
+        do_action( 'bp_network_tool_box' );
+        ?>
 
     </div>
@@ -615 +625 @@
 function bp_core_admin_available_tools_intro() {
     $query_arg = array(
-        'page' => 'bp-tools'
+        'page' => 'bp-tools',
     );
 
-    $page = bp_core_do_network_admin() ? 'admin.php' : 'tools.php' ;
+    $page = bp_core_do_network_admin() ? 'admin.php' : 'tools.php';
     $url  = add_query_arg( $query_arg, bp_get_admin_url( $page ) );
     ?>
     <div class="card tool-box bp-tools">
-        <h2><?php esc_html_e( 'BuddyPress Tools', 'buddypress' ) ?></h2>
+        <h2><?php esc_html_e( 'BuddyPress Tools', 'buddypress' ); ?></h2>
 
         <dl>
-            <dt><?php esc_html_e( 'Repair Tools', 'buddypress' ) ?></dt>
+            <dt><?php esc_html_e( 'Repair Tools', 'buddypress' ); ?></dt>
             <dd>
                 <?php esc_html_e( 'BuddyPress keeps track of various relationships between users, groups, and activity items. Occasionally these relationships become out of sync, most often after an import, update, or migration.', 'buddypress' ); ?>
@@ -637 +647 @@
             </dd>
 
-            <dt><?php esc_html_e( 'Manage Invitations', 'buddypress' ) ?></dt>
+            <dt><?php esc_html_e( 'Manage Invitations', 'buddypress' ); ?></dt>
             <dd>
                 <?php esc_html_e( 'When enabled, BuddyPress allows your users to invite nonmembers to join your site.', 'buddypress' ); ?>
@@ -650 +660 @@
             </dd>
 
-            <dt><?php esc_html_e( 'Manage Opt-outs', 'buddypress' ) ?></dt>
+            <dt><?php esc_html_e( 'Manage Opt-outs', 'buddypress' ); ?></dt>
             <dd>
                 <?php esc_html_e( 'BuddyPress stores opt-out requests from people who are not members of this site, but have been contacted via communication from this site, and wish to opt-out from future communication.', 'buddypress' ); ?>
@@ -685 +695 @@
     }
 
-    $emails = get_posts( array(
-        'fields'           => 'ids',
-        'post_status'      => 'publish',
-        'post_type'        => bp_get_email_post_type(),
-        'posts_per_page'   => 200,
-        'suppress_filters' => false,
-    ) );
+    $emails = get_posts(
+        array(
+            'fields'           => 'ids',
+            'post_status'      => 'publish',
+            'post_type'        => bp_get_email_post_type(),
+            'posts_per_page'   => 200,
+            'suppress_filters' => false,
+        )
+    );
 
     if ( $emails ) {
@@ -699 +711 @@
     }
 
+    $email_tax_type = bp_get_email_tax_type();
+
     // Make sure we have no orphaned email type terms.
-    $email_types = get_terms( bp_get_email_tax_type(), array(
-        'fields'                 => 'ids',
-        'hide_empty'             => false,
-        'update_term_meta_cache' => false,
-    ) );
+    $email_types = get_terms(
+        array(
+            'taxonomy'               => $email_tax_type,
+            'fields'                 => 'ids',
+            'hide_empty'             => false,
+            'update_term_meta_cache' => false,
+        )
+    );
 
     if ( $email_types ) {
         foreach ( $email_types as $term_id ) {
-            wp_delete_term( (int) $term_id, bp_get_email_tax_type() );
-        }
-    }
-
-    require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' );
+            wp_delete_term( (int) $term_id, $email_tax_type );
+        }
+    }
+
+    require_once buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php';
     bp_core_install_emails();
 
@@ -779 +796 @@
 
         if ( isset( $active_components[ $component_id ] ) ) {
-            $prefix = $active_components[ $component_id ] .': ';
+            $prefix = $active_components[ $component_id ] . ': ';
         }
 
@@ -865 +882 @@
             $theme_settings,
             $bp_settings
-        )
+        ),
     );
 
@@ -872 +889 @@
         'description' => __( 'These constants can alter where and how parts of BuddyPress are loaded or works.', 'buddypress' ),
         'fields'      => array(
-            'BP_VERSION' => array(
+            'BP_VERSION'                            => array(
                 'label' => 'BP_VERSION',
                 'value' => BP_VERSION,
             ),
-            'BP_DB_VERSION' => array(
+            'BP_DB_VERSION'                         => array(
                 'label' => 'BP_DB_VERSION',
                 'value' => BP_DB_VERSION,
             ),
-            'BP_REQUIRED_PHP_VERSION' => array(
+            'BP_REQUIRED_PHP_VERSION'               => array(
                 'label' => 'BP_REQUIRED_PHP_VERSION',
                 'value' => BP_REQUIRED_PHP_VERSION,
             ),
-            'BP_PLUGIN_DIR' => array(
+            'BP_PLUGIN_DIR'                         => array(
                 'label' => 'BP_PLUGIN_DIR',
                 'value' => BP_PLUGIN_DIR,
             ),
-            'BP_PLUGIN_URL' => array(
+            'BP_PLUGIN_URL'                         => array(
                 'label' => 'BP_PLUGIN_URL',
                 'value' => BP_PLUGIN_URL,
             ),
-            'BP_IGNORE_DEPRECATED' => array(
+            'BP_IGNORE_DEPRECATED'                  => array(
                 'label' => 'BP_IGNORE_DEPRECATED',
                 'value' => defined( 'BP_IGNORE_DEPRECATED' ) && BP_IGNORE_DEPRECATED ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
                 'debug' => defined( 'BP_IGNORE_DEPRECATED' ) ? BP_IGNORE_DEPRECATED : 'undefined',
             ),
-            'BP_LOAD_DEPRECATED' => array(
+            'BP_LOAD_DEPRECATED'                    => array(
                 'label' => 'BP_LOAD_DEPRECATED',
                 'value' => defined( 'BP_LOAD_DEPRECATED' ) && BP_LOAD_DEPRECATED ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
                 'debug' => defined( 'BP_LOAD_DEPRECATED' ) ? BP_LOAD_DEPRECATED : 'undefined',
             ),
-            'BP_ROOT_BLOG' => array(
+            'BP_ROOT_BLOG'                          => array(
                 'label' => 'BP_ROOT_BLOG',
                 'value' => BP_ROOT_BLOG,
             ),
-            'BP_ENABLE_MULTIBLOG' => array(
+            'BP_ENABLE_MULTIBLOG'                   => array(
                 'label' => 'BP_ENABLE_MULTIBLOG',
                 'value' => defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
                 'debug' => defined( 'BP_ENABLE_MULTIBLOG' ) ? BP_ENABLE_MULTIBLOG : 'undefined',
             ),
-            'BP_ENABLE_ROOT_PROFILES' => array(
+            'BP_ENABLE_ROOT_PROFILES'               => array(
                 'label' => 'BP_ENABLE_ROOT_PROFILES',
                 'value' => defined( 'BP_ENABLE_ROOT_PROFILES' ) && BP_ENABLE_ROOT_PROFILES ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
                 'debug' => defined( 'BP_ENABLE_ROOT_PROFILES' ) ? BP_ENABLE_ROOT_PROFILES : 'undefined',
             ),
-            'BP_DEFAULT_COMPONENT' => array(
+            'BP_DEFAULT_COMPONENT'                  => array(
                 'label' => 'BP_DEFAULT_COMPONENT',
                 'value' => defined( 'BP_DEFAULT_COMPONENT' ) ? BP_DEFAULT_COMPONENT : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_DEFAULT_COMPONENT' ) ? BP_DEFAULT_COMPONENT : 'undefined',
             ),
-            'BP_XPROFILE_BASE_GROUP_NAME' => array(
+            'BP_XPROFILE_BASE_GROUP_NAME'           => array(
                 'label' => 'BP_XPROFILE_BASE_GROUP_NAME',
                 'value' => BP_XPROFILE_BASE_GROUP_NAME,
             ),
-            'BP_XPROFILE_FULLNAME_FIELD_NAME' => array(
+            'BP_XPROFILE_FULLNAME_FIELD_NAME'       => array(
                 'label' => 'BP_XPROFILE_FULLNAME_FIELD_NAME',
                 'value' => BP_XPROFILE_FULLNAME_FIELD_NAME,
             ),
-            'BP_MESSAGES_AUTOCOMPLETE_ALL' => array(
+            'BP_MESSAGES_AUTOCOMPLETE_ALL'          => array(
                 'label' => 'BP_MESSAGES_AUTOCOMPLETE_ALL',
                 'value' => defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ) && BP_MESSAGES_AUTOCOMPLETE_ALL ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
             ),
-            'BP_DISABLE_AUTO_GROUP_JOIN' => array(
+            'BP_DISABLE_AUTO_GROUP_JOIN'            => array(
                 'label' => 'BP_DISABLE_AUTO_GROUP_JOIN',
                 'value' => defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) && BP_DISABLE_AUTO_GROUP_JOIN ? __( 'Disabled', 'buddypress' ) : __( 'Enabled', 'buddypress' ),
                 'debug' => defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? BP_DISABLE_AUTO_GROUP_JOIN : 'undefined',
             ),
-            'BP_GROUPS_DEFAULT_EXTENSION' => array(
+            'BP_GROUPS_DEFAULT_EXTENSION'           => array(
                 'label' => 'BP_GROUPS_DEFAULT_EXTENSION',
                 'value' => defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION : 'undefined',
             ),
-            'BP_SIGNUPS_SKIP_USER_CREATION' => array(
+            'BP_SIGNUPS_SKIP_USER_CREATION'         => array(
                 'label' => 'BP_SIGNUPS_SKIP_USER_CREATION (deprecated)',
                 'value' => defined( 'BP_SIGNUPS_SKIP_USER_CREATION' ) && BP_SIGNUPS_SKIP_USER_CREATION ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
@@ -953 +970 @@
                 'debug' => defined( 'BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH' ) ? BP_MEMBERS_REQUIRED_PASSWORD_STRENGTH : 'undefined',
             ),
-            'BP_EMBED_DISABLE_PRIVATE_MESSAGES' => array(
+            'BP_EMBED_DISABLE_PRIVATE_MESSAGES'     => array(
                 'label' => 'BP_EMBED_DISABLE_PRIVATE_MESSAGES',
                 'value' => defined( 'BP_EMBED_DISABLE_PRIVATE_MESSAGES' ) ? BP_EMBED_DISABLE_PRIVATE_MESSAGES : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_EMBED_DISABLE_PRIVATE_MESSAGES' ) ? BP_EMBED_DISABLE_PRIVATE_MESSAGES : 'undefined',
             ),
-            'BP_EMBED_DISABLE_ACTIVITY_REPLIES' => array(
+            'BP_EMBED_DISABLE_ACTIVITY_REPLIES'     => array(
                 'label' => 'BP_EMBED_DISABLE_ACTIVITY_REPLIES',
                 'value' => defined( 'BP_EMBED_DISABLE_ACTIVITY_REPLIES' ) ? BP_EMBED_DISABLE_ACTIVITY_REPLIES : __( 'Undefined', 'buddypress' ),
@@ -968 +985 @@
                 'debug' => defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) ? BP_ENABLE_USERNAME_COMPATIBILITY_MODE : 'undefined',
             ),
-            'BP_AVATAR_DEFAULT_THUMB' => array(
+            'BP_AVATAR_DEFAULT_THUMB'               => array(
                 'label' => 'BP_AVATAR_DEFAULT_THUMB',
                 'value' => defined( 'BP_AVATAR_DEFAULT_THUMB' ) ? BP_AVATAR_DEFAULT_THUMB : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_AVATAR_DEFAULT_THUMB' ) ? BP_AVATAR_DEFAULT_THUMB : 'undefined',
             ),
-            'BP_AVATAR_DEFAULT' => array(
+            'BP_AVATAR_DEFAULT'                     => array(
                 'label' => 'BP_AVATAR_DEFAULT',
                 'value' => defined( 'BP_AVATAR_DEFAULT' ) ? BP_AVATAR_DEFAULT : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_AVATAR_DEFAULT' ) ? BP_AVATAR_DEFAULT : 'undefined',
             ),
-            'BP_AVATAR_URL' => array(
+            'BP_AVATAR_URL'                         => array(
                 'label' => 'BP_AVATAR_URL',
                 'value' => defined( 'BP_AVATAR_URL' ) ? BP_AVATAR_URL : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_AVATAR_URL' ) ? BP_AVATAR_URL : 'undefined',
             ),
-            'BP_AVATAR_UPLOAD_PATH' => array(
+            'BP_AVATAR_UPLOAD_PATH'                 => array(
                 'label' => 'BP_AVATAR_UPLOAD_PATH',
                 'value' => defined( 'BP_AVATAR_UPLOAD_PATH' ) ? BP_AVATAR_UPLOAD_PATH : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_AVATAR_UPLOAD_PATH' ) ? BP_AVATAR_UPLOAD_PATH : 'undefined',
             ),
-            'BP_SHOW_AVATARS' => array(
+            'BP_SHOW_AVATARS'                       => array(
                 'label' => 'BP_SHOW_AVATARS',
                 'value' => defined( 'BP_SHOW_AVATARS' ) && BP_SHOW_AVATARS ? __( 'Enabled', 'buddypress' ) : __( 'Disabled', 'buddypress' ),
                 'debug' => defined( 'BP_SHOW_AVATARS' ) ? BP_SHOW_AVATARS : 'undefined',
             ),
-            'BP_AVATAR_ORIGINAL_MAX_FILESIZE' => array(
-                'label' => 'BP_AVATAR_ORIGINAL_MAX_FILESIZE',
-                'value' => BP_AVATAR_ORIGINAL_MAX_FILESIZE,
-            ),
-            'BP_AVATAR_ORIGINAL_MAX_WIDTH' => array(
+            'BP_AVATAR_ORIGINAL_MAX_WIDTH'          => array(
                 'label' => 'BP_AVATAR_ORIGINAL_MAX_WIDTH',
                 'value' => BP_AVATAR_ORIGINAL_MAX_WIDTH,
             ),
-            'BP_AVATAR_ORIGINAL_MAX_FILESIZE' => array(
+            'BP_AVATAR_ORIGINAL_MAX_FILESIZE'       => array(
                 'label' => 'BP_AVATAR_ORIGINAL_MAX_FILESIZE',
                 'value' => size_format( BP_AVATAR_ORIGINAL_MAX_FILESIZE ),
                 'debug' => BP_AVATAR_ORIGINAL_MAX_FILESIZE,
             ),
-            'BP_AVATAR_FULL_HEIGHT' => array(
+            'BP_AVATAR_FULL_HEIGHT'                 => array(
                 'label' => 'BP_AVATAR_FULL_HEIGHT',
                 'value' => BP_AVATAR_FULL_HEIGHT,
             ),
-            'BP_AVATAR_FULL_WIDTH' => array(
+            'BP_AVATAR_FULL_WIDTH'                  => array(
                 'label' => 'BP_AVATAR_FULL_WIDTH',
                 'value' => BP_AVATAR_FULL_WIDTH,
             ),
-            'BP_AVATAR_THUMB_HEIGHT' => array(
+            'BP_AVATAR_THUMB_HEIGHT'                => array(
                 'label' => 'BP_AVATAR_THUMB_HEIGHT',
                 'value' => BP_AVATAR_THUMB_HEIGHT,
             ),
-            'BP_AVATAR_THUMB_WIDTH' => array(
+            'BP_AVATAR_THUMB_WIDTH'                 => array(
                 'label' => 'BP_AVATAR_THUMB_WIDTH',
                 'value' => BP_AVATAR_THUMB_WIDTH,
             ),
-            'BP_USE_WP_ADMIN_BAR' => array(
+            'BP_USE_WP_ADMIN_BAR'                   => array(
                 'label' => 'BP_USE_WP_ADMIN_BAR (deprecated)',
                 'value' => defined( 'BP_USE_WP_ADMIN_BAR' ) ? BP_USE_WP_ADMIN_BAR : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_USE_WP_ADMIN_BAR' ) ? BP_USE_WP_ADMIN_BAR : 'undefined',
             ),
-            'BP_FRIENDS_DB_VERSION' => array(
+            'BP_FRIENDS_DB_VERSION'                 => array(
                 'label' => 'BP_FRIENDS_DB_VERSION (deprecated)',
                 'value' => defined( 'BP_FRIENDS_DB_VERSION' ) ? BP_FRIENDS_DB_VERSION : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_FRIENDS_DB_VERSION' ) ? BP_FRIENDS_DB_VERSION : 'undefined',
             ),
-            'BP_FORUMS_PARENT_FORUM_ID' => array(
+            'BP_FORUMS_PARENT_FORUM_ID'             => array(
                 'label' => 'BP_FORUMS_PARENT_FORUM_ID (deprecated)',
                 'value' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ? BP_FORUMS_PARENT_FORUM_ID : 'undefined',
             ),
-            'BP_MEMBERS_SLUG' => array(
+            'BP_MEMBERS_SLUG'                       => array(
                 'label' => 'BP_MEMBERS_SLUG (deprecated)',
                 'value' => defined( 'BP_MEMBERS_SLUG' ) ? BP_MEMBERS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_MEMBERS_SLUG' ) ? BP_MEMBERS_SLUG : 'undefined',
             ),
-            'BP_GROUPS_SLUG' => array(
+            'BP_GROUPS_SLUG'                        => array(
                 'label' => 'BP_GROUPS_SLUG (deprecated)',
                 'value' => defined( 'BP_GROUPS_SLUG' ) ? BP_GROUPS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_GROUPS_SLUG' ) ? BP_GROUPS_SLUG : 'undefined',
             ),
-            'BP_MESSAGES_SLUG' => array(
+            'BP_MESSAGES_SLUG'                      => array(
                 'label' => 'BP_MESSAGES_SLUG (deprecated)',
                 'value' => defined( 'BP_MESSAGES_SLUG' ) ? BP_MESSAGES_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_MESSAGES_SLUG' ) ? BP_MESSAGES_SLUG : 'undefined',
             ),
-            'BP_NOTIFICATIONS_SLUG' => array(
+            'BP_NOTIFICATIONS_SLUG'                 => array(
                 'label' => 'BP_NOTIFICATIONS_SLUG (deprecated)',
                 'value' => defined( 'BP_NOTIFICATIONS_SLUG' ) ? BP_NOTIFICATIONS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_NOTIFICATIONS_SLUG' ) ? BP_NOTIFICATIONS_SLUG : 'undefined',
             ),
-            'BP_BLOGS_SLUG' => array(
+            'BP_BLOGS_SLUG'                         => array(
                 'label' => 'BP_BLOGS_SLUG (deprecated)',
                 'value' => defined( 'BP_BLOGS_SLUG' ) ? BP_BLOGS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_BLOGS_SLUG' ) ? BP_BLOGS_SLUG : 'undefined',
             ),
-            'BP_FRIENDS_SLUG' => array(
+            'BP_FRIENDS_SLUG'                       => array(
                 'label' => 'BP_FRIENDS_SLUG (deprecated)',
                 'value' => defined( 'BP_FRIENDS_SLUG' ) ? BP_FRIENDS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_FRIENDS_SLUG' ) ? BP_FRIENDS_SLUG : 'undefined',
             ),
-            'BP_ACTIVITY_SLUG' => array(
+            'BP_ACTIVITY_SLUG'                      => array(
                 'label' => 'BP_ACTIVITY_SLUG (deprecated)',
                 'value' => defined( 'BP_ACTIVITY_SLUG' ) ? BP_ACTIVITY_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_ACTIVITY_SLUG' ) ? BP_ACTIVITY_SLUG : 'undefined',
             ),
-            'BP_SETTINGS_SLUG' => array(
+            'BP_SETTINGS_SLUG'                      => array(
                 'label' => 'BP_SETTINGS_SLUG (deprecated)',
                 'value' => defined( 'BP_SETTINGS_SLUG' ) ? BP_SETTINGS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_SETTINGS_SLUG' ) ? BP_SETTINGS_SLUG : 'undefined',
             ),
-            'BP_XPROFILE_SLUG' => array(
+            'BP_XPROFILE_SLUG'                      => array(
                 'label' => 'BP_XPROFILE_SLUG (deprecated)',
                 'value' => defined( 'BP_XPROFILE_SLUG' ) ? BP_XPROFILE_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_XPROFILE_SLUG' ) ? BP_XPROFILE_SLUG : 'undefined',
             ),
-            'BP_FORUMS_SLUG' => array(
+            'BP_FORUMS_SLUG'                        => array(
                 'label' => 'BP_FORUMS_SLUG (deprecated)',
                 'value' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_FORUMS_SLUG' ) ? BP_FORUMS_SLUG : 'undefined',
             ),
-            'BP_SEARCH_SLUG' => array(
+            'BP_SEARCH_SLUG'                        => array(
                 'label' => 'BP_SEARCH_SLUG (deprecated)',
                 'value' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : __( 'Undefined', 'buddypress' ),
                 'debug' => defined( 'BP_SEARCH_SLUG' ) ? BP_SEARCH_SLUG : 'undefined',
             ),
-        )
+        ),
     );
 

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

@@ -726 +726 @@
  * @since 1.7.0
  *
- * @param string $default Optional. Fallback value if not found in the database.
- *                        Default: 'legacy'.
+ * @param string $package_id Optional. Fallback value if not found in the database.
+ *                           Default: 'legacy'.
  * @return string ID of the theme package.
  */
-function bp_get_theme_package_id( $default = 'legacy' ) {
+function bp_get_theme_package_id( $package_id = 'legacy' ) {
 
     /**
@@ -737 +737 @@
      * @since 1.7.0
      *
-     * @param string $value The current theme package ID.
-     */
-    return apply_filters( 'bp_get_theme_package_id', bp_get_option( '_bp_theme_package_id', $default ) );
-}
+     * @param string $package_id The current theme package ID.
+     */
+    return apply_filters( 'bp_get_theme_package_id', bp_get_option( '_bp_theme_package_id', $package_id ) );
+}