Skip to:
Content

BuddyPress.org

Ticket #2373: ms_include_with_checks.diff

File ms_include_with_checks.diff, 2.0 KB (added by mattwiebe, 15 years ago)
  • wp-content/plugins/buddypress/bp-core.php

     
    414414 * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
    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 )
    420420                return false;
     
    422422        if ( 'admin' == $bp->current_component && ( 'mark-spammer' == $bp->current_action || 'unmark-spammer' == $bp->current_action ) ) {
    423423                /* Check the nonce */
    424424                check_admin_referer( 'mark-unmark-spammer' );
    425 
    426                 /* 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' );
    429 
     425               
     426                /* Get Multisite/Multiuser functions file */
     427                if ( bp_core_is_multisite() ) {
     428                        if ( $wp_version >= '3.0' ) {
     429                                require_once( ABSPATH . '/wp-admin/includes/ms.php' );
     430                        }
     431                        else {
     432                                require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     433                        }
     434                }
     435               
    430436                if ( 'mark-spammer' == $bp->current_action )
    431437                        $is_spam = 1;
    432438                else
     
    16991705 * @uses get_site_option Checks if account deletion is allowed
    17001706 */
    17011707function bp_core_delete_account( $user_id = false ) {
    1702         global $bp, $wpdb;
     1708        global $bp, $wpdb, $wp_version;
    17031709
    17041710        if ( !$user_id )
    17051711                $user_id = $bp->loggedin_user->id;
     
    17141720                if ( is_site_admin( bp_core_get_username( $user_id ) ) )
    17151721                        return false;
    17161722
    1717                 require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     1723                /* Get Multisite/Multiuser functions file */
     1724                if ( $wp_version >= '3.0' ) {
     1725                        require_once( ABSPATH . '/wp-admin/includes/ms.php' );
     1726                }
     1727                else {
     1728                        require_once( ABSPATH . '/wp-admin/includes/mu.php' );
     1729                }
     1730
    17181731                require_once( ABSPATH . '/wp-admin/includes/user.php' );
    17191732
    17201733                return wpmu_delete_user( $user_id );