<!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] [2903] branches/1.2/bp-core.php: Fixes #2272 and update phpdoc
; props francescolaffi</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2903</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-05 13:20:02 +0000 (Mon, 05 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2272 and update phpdoc; props francescolaffi</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (2902 => 2903)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-04-05 13:13:00 UTC (rev 2902)
+++ branches/1.2/bp-core.php 2010-04-05 13:20:02 UTC (rev 2903)
</span><span class="lines">@@ -1692,9 +1692,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</span><del>- * @uses check_admin_referer() Checks for a valid security nonce.
</del><span class="cx"> * @uses is_site_admin() Checks to see if the user is a site administrator.
</span><del>- * @uses wpmu_delete_user() Deletes a user from the system.
</del><ins>+ * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
+ * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
+ * @uses get_site_option Checks if account deletion is allowed
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_delete_account( $user_id = false ) {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="lines">@@ -1706,17 +1707,19 @@
</span><span class="cx"> if ( (int)get_site_option( 'bp-disable-account-deletion' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Site admins should not be allowed to be deleted */
- if ( bp_core_is_multisite() && is_site_admin( bp_core_get_username( $user_id ) ) )
- return false;
</del><ins>+ /* 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;
</ins><span class="cx">
</span><del>- if ( bp_core_is_multisite() && function_exists('wpmu_delete_user') ) {
</del><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/mu.php' );
</span><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/user.php' );
</span><span class="cx">
</span><span class="cx"> return wpmu_delete_user( $user_id );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Single site user deletion */
</ins><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/user.php' );
</span><span class="cx"> return wp_delete_user( $user_id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>