<!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][6049] trunk/bp-members/bp-members-functions.php: On WP Single, always generate activation key</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, #logmsg > ol { margin-left: 0; 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/6049">6049</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-05-27 16:25:29 +0000 (Sun, 27 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>On WP Single, always generate activation key
When 'bp_core_signup_send_activation_key' is filtered to false, an activation
key should still be generated, otherwise the newly created user will be unable
to activate her account. This changeset ensures that the activation key is
generated, even if a plugin is preventing the key from being sent via email.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4218">#4218</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (6048 => 6049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2012-05-27 15:36:16 UTC (rev 6048)
+++ trunk/bp-members/bp-members-functions.php 2012-05-27 16:25:29 UTC (rev 6049)
</span><span class="lines">@@ -1096,15 +1096,20 @@
</span><span class="cx"> $bp->signup->username = $user_login;
</span><span class="cx">
</span><span class="cx"> /***
</span><del>- * Now generate an activation key and send an email to the user so they can activate their account
- * and validate their email address. Multisite installs send their own email, so this is only for single blog installs.
</del><ins>+ * Now generate an activation key and send an email to the user so they can activate their
+ * account and validate their email address. Multisite installs send their own email, so
+ * this is only for single blog installs.
</ins><span class="cx"> *
</span><del>- * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
</del><ins>+ * To disable sending activation emails you can user the filter
+ * 'bp_core_signup_send_activation_key' and return false. Note that this will only disable
+ * the email - a key will still be generated, and the account must still be activated
+ * before use.
</ins><span class="cx"> */
</span><del>- if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
- if ( !is_multisite() ) {
- $activation_key = wp_hash( $user_id );
- update_user_meta( $user_id, 'activation_key', $activation_key );
</del><ins>+ if ( !is_multisite() ) {
+ $activation_key = wp_hash( $user_id );
+ update_user_meta( $user_id, 'activation_key', $activation_key );
+
+ if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
</ins><span class="cx"> bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>