Skip to:
Content

BuddyPress.org

Changeset 3010


Ignore:
Timestamp:
05/19/2010 12:57:24 AM (15 years ago)
Author:
apeatling
Message:

Fixes #2373 props mattwiebe

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2/bp-core.php

    r3008 r3010  
    415415 */
    416416function bp_core_action_set_spammer_status() {
    417     global $bp, $wpdb;
     417    global $bp, $wpdb, $wp_version;
    418418
    419419    if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
     
    425425
    426426        /* Get the functions file */
    427         if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multisite() )
    428             require( ABSPATH . 'wp-admin/includes/mu.php' );
     427        if ( bp_core_is_multisite() ) {
     428            if ( $wp_version >= '3.0' )
     429                require_once( ABSPATH . '/wp-admin/includes/ms.php' );
     430            else
     431                require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     432        }
    429433
    430434        if ( 'mark-spammer' == $bp->current_action )
     
    17001704 */
    17011705function bp_core_delete_account( $user_id = false ) {
    1702     global $bp, $wpdb;
     1706    global $bp, $wpdb, $wp_version;
    17031707
    17041708    if ( !$user_id )
     
    17151719            return false;
    17161720
    1717         require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     1721        if ( $wp_version >= '3.0' )
     1722            require_once( ABSPATH . '/wp-admin/includes/ms.php' );
     1723        else
     1724            require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     1725
    17181726        require_once( ABSPATH . '/wp-admin/includes/user.php' );
    17191727
Note: See TracChangeset for help on using the changeset viewer.