Changeset 3059

Timestamp:

06/20/2010 09:48:39 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fix #2414

File:

• branches/1.2/bp-core.php (modified) (2 diffs)

branches/1.2/bp-core.php

@@ -1714 +1714 @@
                 return false;
 
+        /* Site admins cannot be deleted */
+        if ( is_site_admin( bp_core_get_username( $user_id ) ) )
+                return false;
+
         /* Specifically handle multi-site environment */
         if ( bp_core_is_multisite() ) {
-                /* Site admins cannot be deleted */
-                if ( is_site_admin( bp_core_get_username( $user_id ) ) )
-                        return false;
-
                 if ( $wp_version >= '3.0' )
                         require_once( ABSPATH . '/wp-admin/includes/ms.php' );
@@ -1728 +1728 @@
 
                 return wpmu_delete_user( $user_id );
-        }
 
         /* Single site user deletion */
-        require_once( ABSPATH . '/wp-admin/includes/user.php' );
-        return wp_delete_user( $user_id );
+        } else {
+                require_once( ABSPATH . '/wp-admin/includes/user.php' );
+                return wp_delete_user( $user_id );
+        }
 }