<!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] [1970] trunk/bp-core/bp-core-activation.php: Fixes #1102</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1970</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-28 01:02:12 +0000 (Mon, 28 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1102</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreactivationphp">trunk/bp-core/bp-core-activation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreactivationphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-activation.php (1969 => 1970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-activation.php 2009-09-28 00:49:11 UTC (rev 1969)
+++ trunk/bp-core/bp-core-activation.php 2009-09-28 01:02:12 UTC (rev 1970)
</span><span class="lines">@@ -77,10 +77,30 @@
</span><span class="cx"> *
</span><span class="cx"> * Since the user now chooses their password, sending it over clear-text to an
</span><span class="cx"> * email address is no longer necessary. It's also a terrible idea security wise.
</span><ins>+ *
+ * This will only disable the email if a custom registration template is being used.
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_disable_welcome_email() {
</span><ins>+ if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
+ return true;
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
</span><span class="cx">
</span><ins>+/***
+ * bp_core_filter_activation_email()
+ *
+ * Filter the activation email to remove the line stating that another email will be sent
+ * with the generated login details. This is not the case due to bp_core_disable_welcome_email()
+ */
+function bp_core_filter_activation_email( $email ) {
+ if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
+ return $email;
+
+ return str_replace( __( 'After you activate, you will receive *another email* with your login.', 'buddypress' ), '', $email );
+}
+add_filter( 'wpmu_signup_user_notification_email', 'bp_core_filter_activation_email' );
+add_filter( 'wpmu_signup_blog_notification_email', 'bp_core_filter_activation_email' );
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>