Changeset 2419

Timestamp:

01/24/2010 01:55:35 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1586 - delete user on single wp installs.

File:

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

trunk/bp-core.php

@@ -1630 +1630 @@
  */
 function bp_core_delete_account( $user_id = false ) {
-        global $bp;
+        global $bp, $wpdb;
 
         if ( !$user_id )
@@ -1640 +1640 @@
 
         /* Site admins should not be allowed to be deleted */
-        if ( is_site_admin( bp_core_get_username( $user_id ) ) )
-                return false;
-
-        require_once( ABSPATH . '/wp-admin/includes/mu.php' );
-        require_once( ABSPATH . '/wp-admin/includes/user.php' );
-
-        return wpmu_delete_user( $user_id );
+        if ( bp_core_is_multisite() && is_site_admin( bp_core_get_username( $user_id ) ) )
+                return false;
+
+        if ( bp_core_is_multisite() && function_exists('wpmu_delete_user') ) {
+                require_once( ABSPATH . '/wp-admin/includes/mu.php' );
+                require_once( ABSPATH . '/wp-admin/includes/user.php' );
+
+                return wpmu_delete_user( $user_id );
+        }
+
+        $delete_user = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->users WHERE ID = %d", $user_id ) );
+        $delete_usermeta = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id = %d", $user_id ) );
+
+        $user = bp_core_get_core_userdata( $user_id );
+
+        wp_cache_delete( $user_id, 'users' );
+        wp_cache_delete( $user->user_login, 'userlogins' );
+
+        if ( !$delete_user || !$delete_usermeta )
+                return false;
+
+        return true;
 }