Skip to:
Content

BuddyPress.org

Ticket #6889: 6889-remove-bp-core-user-use.diff

File 6889-remove-bp-core-user-use.diff, 3.1 KB (added by tw2113, 8 years ago)

  • src/bp-friends/bp-friends-functions.php 

    diff --git src/bp-friends/bp-friends-functions.php src/bp-friends/bp-friends-functions.php
index b8d4341..f2492d4 100644
    function friends_get_friendship_request_user_ids( $user_id ) { 
    422422 */
    423423function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
    424424
     425        $user_args = array(
     426                'type'     => 'active',
     427                'per_page' => $per_page,
     428                'page'     => $page,
     429                'user_id'  => $user_id,
     430                'include'  => $filter,
     431        );
     432
    425433        /**
    426434         * Filters a user's most recently active friends.
    427435         *
    … … function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filte 
    432440         *     @type array $paged_users The current page of users matched by query params.
    433441         * }
    434442         */
    435         return apply_filters( 'friends_get_recently_active', BP_Core_User::get_users( 'active', $per_page, $page, $user_id, $filter ) );
     443        return apply_filters( 'friends_get_recently_active', new BP_User_Query( $user_args ) );
    436444}
    437445
    438446/**
    … … function friends_get_recently_active( $user_id, $per_page = 0, $page = 0, $filte 
    453461 */
    454462function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
    455463
     464        $user_args = array(
     465                'type'     => 'alphabetical',
     466                'per_page' => $per_page,
     467                'page'     => $page,
     468                'user_id'  => $user_id,
     469                'include'  => $filter,
     470        );
     471
    456472        /**
    457473         * Filters a user's friends listed in alphabetical order.
    458474         *
    … … function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter 
    463479         *     @type array $paged_users The current page of users matched by query params.
    464480         * }
    465481         */
    466         return apply_filters( 'friends_get_alphabetically', BP_Core_User::get_users( 'alphabetical', $per_page, $page, $user_id, $filter ) );
     482        return apply_filters( 'friends_get_alphabetically', new BP_User_Query( $user_args ) );
    467483}
    468484
    469485/**
    … … function friends_get_alphabetically( $user_id, $per_page = 0, $page = 0, $filter 
    484500 */
    485501function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) {
    486502
     503        $user_args = array(
     504                'type'     => 'newest',
     505                'per_page' => $per_page,
     506                'page'     => $page,
     507                'user_id'  => $user_id,
     508                'include'  => $filter,
     509        );
     510
    487511        /**
    488512         * Filters a user's friends listed from newest to oldest.
    489513         *
    … … function friends_get_newest( $user_id, $per_page = 0, $page = 0, $filter = '' ) 
    494518         *     @type array $paged_users The current page of users matched by query params.
    495519         * }
    496520         */
    497         return apply_filters( 'friends_get_newest', BP_Core_User::get_users( 'newest', $per_page, $page, $user_id, $filter ) );
     521        return apply_filters( 'friends_get_newest', new BP_User_Query( $user_args ) );
    498522}
    499523
    500524/**
    … … function friends_notification_accepted_request( $friendship_id, $initiator_id, $ 
    869893        );
    870894        bp_send_email( 'friends-request-accepted', $initiator_id, $args );
    871895}
    872 add_action( 'friends_friendship_accepted', 'friends_notification_accepted_request', 10, 3 );
    873  No newline at end of file
     896add_action( 'friends_friendship_accepted', 'friends_notification_accepted_request', 10, 3 );