Ticket #2373: ms_include.diff

bp-core.php

@@ -426 +426 @@
                 /* Get the functions file */
                 if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multisite() )
                         require( ABSPATH . 'wp-admin/includes/mu.php' );
+                /* Get the WP 3.0 + funcitons file */
+                if ( file_exists( ABSPATH . 'wp-admin/includes/ms.php' ) && bp_core_is_multisite() )
+                        require( ABSPATH . 'wp-admin/includes/ms.php' );
 
                 if ( 'mark-spammer' == $bp->current_action )
                         $is_spam = 1;
@@ -1713 +1716 @@
                 /* Site admins cannot be deleted */
                 if ( is_site_admin( bp_core_get_username( $user_id ) ) )
                         return false;
-
-                require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+                
+                /* WP MU <= 2.9 */
+                if ( file_exists ( ABSPATH . '/wp-admin/includes/mu.php' ) )
+                        require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+                /* WP >= 3.0 */
+                if ( file_exists ( ABSPATH . '/wp-admin/includes/ms.php' ) )
+                        require_once( ABSPATH . '/wp-admin/includes/ms.php' );
+                        
                 require_once( ABSPATH . '/wp-admin/includes/user.php' );
 
                 return wpmu_delete_user( $user_id );