Ticket #2373: ms_include_with_checks.diff
File ms_include_with_checks.diff, 2.0 KB (added by , 15 years ago) |
---|
-
wp-content/plugins/buddypress/bp-core.php
414 414 * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals() 415 415 */ 416 416 function bp_core_action_set_spammer_status() { 417 global $bp, $wpdb ;417 global $bp, $wpdb, $wp_version; 418 418 419 419 if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id ) 420 420 return false; … … 422 422 if ( 'admin' == $bp->current_component && ( 'mark-spammer' == $bp->current_action || 'unmark-spammer' == $bp->current_action ) ) { 423 423 /* Check the nonce */ 424 424 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 430 436 if ( 'mark-spammer' == $bp->current_action ) 431 437 $is_spam = 1; 432 438 else … … 1699 1705 * @uses get_site_option Checks if account deletion is allowed 1700 1706 */ 1701 1707 function bp_core_delete_account( $user_id = false ) { 1702 global $bp, $wpdb ;1708 global $bp, $wpdb, $wp_version; 1703 1709 1704 1710 if ( !$user_id ) 1705 1711 $user_id = $bp->loggedin_user->id; … … 1714 1720 if ( is_site_admin( bp_core_get_username( $user_id ) ) ) 1715 1721 return false; 1716 1722 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 1718 1731 require_once( ABSPATH . '/wp-admin/includes/user.php' ); 1719 1732 1720 1733 return wpmu_delete_user( $user_id );