<!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] [2773] branches/1.2: Fixes #2043</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2773</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-23 12:01:04 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2043</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoreactivationphp">branches/1.2/bp-core/bp-core-activation.php</a></li>
<li><a href="#branches12bpthemesbpdefaultregistrationregisterphp">branches/1.2/bp-themes/bp-default/registration/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoreactivationphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-activation.php (2772 => 2773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-activation.php 2010-02-23 11:04:00 UTC (rev 2772)
+++ branches/1.2/bp-core/bp-core-activation.php 2010-02-23 12:01:04 UTC (rev 2773)
</span><span class="lines">@@ -75,25 +75,37 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_core_screen_activation', 3 );
</span><span class="cx">
</span><ins>+/***
+ * bp_core_filter_user_welcome_email()
+ *
+ * Replace the generated password in the welcome email.
+ * This will not filter when the site admin registers a user.
+ */
+function bp_core_filter_user_welcome_email( $welcome_email ) {
+ /* Don't touch the email if we don't have a custom registration template */
+ if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
+ return $welcome_email;
</ins><span class="cx">
</span><ins>+ return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
+}
+if ( !is_admin() && empty( $_GET['e'] ) )
+ add_filter( 'update_welcome_user_email', 'bp_core_filter_user_welcome_email' );
+
</ins><span class="cx"> /***
</span><del>- * bp_core_disable_welcome_email()
</del><ins>+ * bp_core_filter_blog_welcome_email()
</ins><span class="cx"> *
</span><del>- * Since the user now chooses their password, sending it over clear-text to an
- * email address is no longer necessary. It's also a terrible idea security wise.
- *
- * The only exception to this is when an admin has generated an account for a user.
- *
- * This will only disable the email if a custom registration template is being used.
</del><ins>+ * Replace the generated password in the welcome email.
+ * This will not filter when the site admin registers a user.
</ins><span class="cx"> */
</span><del>-function bp_core_disable_welcome_email() {
</del><ins>+function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
+ /* Don't touch the email if we don't have a custom registration template */
</ins><span class="cx"> if ( '' == locate_template( array( 'registration/register.php' ), false ) && '' == locate_template( array( 'register.php' ), false ) )
</span><del>- return true;
</del><ins>+ return $welcome_email;
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ return str_replace( $password, __( '[User Set]', 'buddypress' ), $welcome_email );
</ins><span class="cx"> }
</span><span class="cx"> if ( !is_admin() && empty( $_GET['e'] ) )
</span><del>- add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
</del><ins>+ add_filter( 'update_welcome_email', 'bp_core_filter_blog_welcome_email', 10, 4 );
</ins><span class="cx">
</span><span class="cx"> // Notify user of signup success.
</span><span class="cx"> function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta ) {
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/registration/register.php (2772 => 2773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/registration/register.php 2010-02-23 11:04:00 UTC (rev 2772)
+++ branches/1.2/bp-themes/bp-default/registration/register.php 2010-02-23 12:01:04 UTC (rev 2773)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new blog', 'buddypress' ) ?></p>
</span><span class="cx">
</span><del>- <div id="blog-details">
</del><ins>+ <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
</ins><span class="cx">
</span><span class="cx"> <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
</span><span class="cx"> <?php do_action( 'bp_signup_blog_url_errors' ) ?>
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> jQuery(document).ready( function() {
</span><del>- if ( jQuery('div#blog-details').length )
</del><ins>+ if ( jQuery('div#blog-details').length && !jQuery('div#blog-details').hasClass('show') )
</ins><span class="cx"> jQuery('div#blog-details').toggle();
</span><span class="cx">
</span><span class="cx"> jQuery( 'input#signup_with_blog' ).click( function() {
</span></span></pre>
</div>
</div>
</body>
</html>