<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2419] trunk/bp-core.php:
Fixes #1586 - delete user on single wp installs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2419</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 13:55:35 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1586 - delete user on single wp installs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2418 => 2419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-24 13:22:11 UTC (rev 2418)
+++ trunk/bp-core.php 2010-01-24 13:55:35 UTC (rev 2419)
</span><span class="lines">@@ -1629,7 +1629,7 @@
</span><span class="cx"> * @uses wpmu_delete_user() Deletes a user from the system.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_delete_account( $user_id = false ) {
</span><del>- global $bp;
</del><ins>+ global $bp, $wpdb;
</ins><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="lines">@@ -1639,13 +1639,28 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Site admins should not be allowed to be deleted */
</span><del>- if ( is_site_admin( bp_core_get_username( $user_id ) ) )
</del><ins>+ if ( bp_core_is_multisite() && is_site_admin( bp_core_get_username( $user_id ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- require_once( ABSPATH . '/wp-admin/includes/mu.php' );
- require_once( ABSPATH . '/wp-admin/includes/user.php' );
</del><ins>+ 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' );
</ins><span class="cx">
</span><del>- return wpmu_delete_user( $user_id );
</del><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>