<!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] [2997] branches/1.2/bp-core/bp-core-filters.php: Fixes #2278</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2997</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-05-13 19:41:35 +0000 (Thu, 13 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2278</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorefiltersphp">branches/1.2/bp-core/bp-core-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-filters.php (2996 => 2997)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-filters.php 2010-05-13 19:29:13 UTC (rev 2996)
+++ branches/1.2/bp-core/bp-core-filters.php 2010-05-13 19:41:35 UTC (rev 2997)
</span><span class="lines">@@ -119,12 +119,17 @@
</span><span class="cx"> *
</span><span class="cx"> * Replace the generated password in the welcome email.
</span><span class="cx"> * This will not filter when the site admin registers a user.
</span><ins>+ *
+ * @uses locate_template To see if custom registration files exist
+ * @param string $welcome_email Complete email passed through WordPress
+ * @return string Filtered $welcome_email with 'PASSWORD' replaced by [User Set]
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_filter_user_welcome_email( $welcome_email ) {
</span><span class="cx"> /* Don't touch the email if we don't have a custom registration template */
</span><span class="cx"> if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
</span><span class="cx"> return $welcome_email;
</span><span class="cx">
</span><ins>+ // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
</ins><span class="cx"> return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
</span><span class="cx"> }
</span><span class="cx"> if ( !is_admin() && empty( $_GET['e'] ) )
</span><span class="lines">@@ -135,12 +140,20 @@
</span><span class="cx"> *
</span><span class="cx"> * Replace the generated password in the welcome email.
</span><span class="cx"> * This will not filter when the site admin registers a user.
</span><ins>+ *
+ * @uses locate_template To see if custom registration files exist
+ * @param string $welcome_email Complete email passed through WordPress
+ * @param integer $blog_id ID of the blog user is joining
+ * @param integer $user_id ID of the user joining
+ * @param string $password Password of user
+ * @return string Filtered $welcome_email with $password replaced by [User Set]
</ins><span class="cx"> */
</span><span class="cx"> function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
</span><span class="cx"> /* Don't touch the email if we don't have a custom registration template */
</span><span class="cx"> if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
</span><span class="cx"> return $welcome_email;
</span><span class="cx">
</span><ins>+ // [User Set] Replaces $password in welcome email; Represents value set by user
</ins><span class="cx"> return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
</span><span class="cx"> }
</span><span class="cx"> if ( !is_admin() && empty( $_GET['e'] ) )
</span></span></pre>
</div>
</div>
</body>
</html>