Skip to:
Content

bbPress.org

Changeset 6057


Ignore:
Timestamp:
06/05/2016 06:43:21 PM (3 years ago)
Author:
johnjamesjacoby
Message:

Users: Revert accidental removal of r6051, r6052, from r6056.

Location:
trunk/src/includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/users.php

    r6056 r6057  
    5757        add_filter( 'manage_users_custom_column', array( $this, 'user_role_row'           ), 10, 3 );
    5858
     59        // Only list bbPress roles under Forum Role, remove from WordPress' > 4.4 Site Role list.
     60        if ( bbp_get_major_wp_version() >= 4.4 ) {
     61            add_filter( 'get_role_list',          array( $this, 'user_role_list_filter'   ), 10, 2 );
     62        }
     63
    5964        // Process bulk role change
    6065        add_action( 'load-users.php',             array( $this, 'user_role_bulk_change'   )        );
     
    129134    public static function user_role_bulk_dropdown() {
    130135
    131         // Bail if current user cannot promote users 
     136        // Bail if current user cannot promote users
    132137        if ( ! current_user_can( 'promote_users' ) ) {
    133138            return;
     
    184189        check_admin_referer( 'bbp-bulk-users', 'bbp-bulk-users-nonce' );
    185190
    186         // Bail if current user cannot promote users 
     191        // Bail if current user cannot promote users
    187192        if ( ! current_user_can( 'promote_users' ) ) {
    188193            return;
     
    202207
    203208            // Set up user and role data
    204             $user_role = bbp_get_user_role( $user_id );         
     209            $user_role = bbp_get_user_role( $user_id );
    205210            $new_role  = sanitize_text_field( $_REQUEST['bbp-new-role'] );
    206211
     
    263268        return $retval;
    264269    }
     270
     271    /**
     272     * Filter the list of roles included in the WordPress site role list
     273     *
     274     * This ensures bbPress' roles are only displayed under the Forum Role list
     275     * in the WordPress Users list table
     276     *
     277     * @since 2.6.0 bbPress (r6051)
     278     *
     279     * @return array $roles
     280     */
     281    public static function user_role_list_filter( $roles, $user ) {
     282
     283        // Get the users role
     284        $user_role = bbp_get_user_role( $user->ID );
     285
     286        if ( ! empty( $user_role ) ) {
     287            unset( $roles[ $user_role ] );
     288        }
     289
     290        return $roles;
     291    }
    265292}
    266293new BBP_Users_Admin();
  • trunk/src/includes/common/formatting.php

    r6039 r6057  
    368368 * Make URLs clickable in content areas
    369369 *
    370  * @since 2.6.0
     370 * @since 2.6.0 bbPress (r6014)
    371371 *
    372372 * @param  string $text
     
    396396 * Make FTP clickable in content areas
    397397 *
    398  * @since 2.6.0
     398 * @since 2.6.0 bbPress (r6014)
    399399 *
    400400 * @see make_clickable()
     
    410410 * Make emails clickable in content areas
    411411 *
    412  * @since 2.6.0
     412 * @since 2.6.0 bbPress (r6014)
    413413 *
    414414 * @see make_clickable()
     
    424424 * Make mentions clickable in content areas
    425425 *
    426  * @since 2.6.0
     426 * @since 2.6.0 bbPress (r6014)
    427427 *
    428428 * @see make_clickable()
     
    438438 * Callback to convert mention matchs to HTML A tag.
    439439 *
    440  * @since 2.6.0
     440 * @since 2.6.0 (r6014)
    441441 *
    442442 * @param array $matches Single Regex Match.
  • trunk/src/includes/core/abstraction.php

    r6056 r6057  
    129129    return apply_filters( 'bbp_pretty_urls', $retval );
    130130}
     131
     132/**
     133 * Parse the WordPress core version number
     134 *
     135 * @since 2.6.0 bbPress (r6051)
     136 *
     137 * @global string $wp_version
     138 *
     139 * @return string $wp_version
     140 */
     141function bbp_get_major_wp_version() {
     142    global $wp_version;
     143
     144    return (float) $wp_version;
     145}
Note: See TracChangeset for help on using the changeset viewer.