<!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" />
<title>[BuddyPress][8325] branches/2.0: Check bp_disable_account_deletion() setting in screen function rather than bp_core_delete_account() business function</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8325">8325</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-04-26 18:45:35 +0000 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check bp_disable_account_deletion() setting in screen function rather than bp_core_delete_account() business function
The purpose of the disable-account-deletion setting is to prevent normal (ie
non-admin) BP users from deleting their own accounts through the front-end
interface. Locating the settings check in the business function
bp_core_delete_account() therefore caused problems when deleting accounts in
areas that were not meant to be covered by the setting, such as when accounts
are deleted in the Dashboard by an admin, or when the BP_Signup::delete()
method is called. This caused a particular problem in BP 2.0, because the
deletion of signups was no longer correctly cleaning up other data from the
database (xprofile, usermeta, etc).
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5575">#5575</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches20bpmembersbpmembersfunctionsphp">branches/2.0/bp-members/bp-members-functions.php</a></li>
<li><a href="#branches20bpsettingsbpsettingsactionsphp">branches/2.0/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches20bpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/2.0/bp-members/bp-members-functions.php (8324 => 8325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/bp-members/bp-members-functions.php 2014-04-26 18:45:19 UTC (rev 8324)
+++ branches/2.0/bp-members/bp-members-functions.php 2014-04-26 18:45:35 UTC (rev 8325)
</span><span class="lines">@@ -1054,10 +1054,6 @@
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="cx">
</span><del>- // Bail if account deletion is disabled
- if ( bp_disable_account_deletion() )
- return false;
-
</del><span class="cx"> // Site admins cannot be deleted
</span><span class="cx"> if ( is_super_admin( $user_id ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branches20bpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: branches/2.0/bp-settings/bp-settings-actions.php (8324 => 8325)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/bp-settings/bp-settings-actions.php 2014-04-26 18:45:19 UTC (rev 8324)
+++ branches/2.0/bp-settings/bp-settings-actions.php 2014-04-26 18:45:35 UTC (rev 8325)
</span><span class="lines">@@ -333,6 +333,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Bail if account deletion is disabled
+ if ( bp_disable_account_deletion() && ! bp_current_user_can( 'delete_users' ) ) {
+ return false;
+ }
+
</ins><span class="cx"> // Nonce check
</span><span class="cx"> check_admin_referer( 'delete-account' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>