<!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] [2160] branches/1.1/bp-core:
Fixing incorrect activation link in 1.1 branch.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2160</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-30 14:00:00 +0000 (Mon, 30 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing incorrect activation link in 1.1 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches11bpcorebpcoreactivationphp">branches/1.1/bp-core/bp-core-activation.php</a></li>
<li><a href="#branches11bpcoredeprecatedbpcoredeprecatedphp">branches/1.1/bp-core/deprecated/bp-core-deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches11bpcorebpcoreactivationphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-core/bp-core-activation.php (2159 => 2160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-core/bp-core-activation.php 2009-11-30 12:37:46 UTC (rev 2159)
+++ branches/1.1/bp-core/bp-core-activation.php 2009-11-30 14:00:00 UTC (rev 2160)
</span><span class="lines">@@ -95,19 +95,61 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'wpmu_welcome_user_notification', 'bp_core_disable_welcome_email' );
</span><span class="cx">
</span><del>-/***
- * 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;
</del><ins>+// Notify user of signup success.
+function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta ) {
+ global $current_site;
</ins><span class="cx">
</span><del>- return str_replace( __( 'After you activate, you will receive *another email* with your login.', 'buddypress' ), '', $email );
</del><ins>+ // Send email with activation link.
+ if ( 'no' == constant( "VHOST" ) ) {
+ $activate_url = bp_activation_page( false ) . "?key=$key";
+ } else {
+ $activate_url = bp_activation_page( false ) ."?key=$key";
+ }
+
+ $activate_url = clean_url($activate_url);
+ $admin_email = get_site_option( "admin_email" );
+
+ if ( empty( $admin_email ) )
+ $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+
+ $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+ $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+ $message = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
+ $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
+
+ wp_mail($user_email, $subject, $message, $message_headers);
+
+ // Return false to stop the original WPMU function from continuing
+ return false;
</ins><span class="cx"> }
</span><del>-add_filter( 'wpmu_signup_user_notification_email', 'bp_core_filter_activation_email' );
-add_filter( 'wpmu_signup_blog_notification_email', 'bp_core_filter_activation_email' );
</del><ins>+add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
</ins><span class="cx">
</span><ins>+function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
+ global $current_site;
+
+ // Send email with activation link.
+ if ( 'no' == constant( "VHOST" ) ) {
+ $activate_url = bp_activation_page( false ) . "?key=$key";
+ } else {
+ $activate_url = bp_activation_page( false ) ."?key=$key";
+ }
+
+ $activate_url = clean_url($activate_url);
+ $admin_email = get_site_option( "admin_email" );
+
+ if ( empty( $admin_email ) )
+ $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+
+ $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+ $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+ $message = sprintf(__("Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
+ $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
+
+ wp_mail($user_email, $subject, $message, $message_headers);
+
+ // Return false to stop the original WPMU function from continuing
+ return false;
+}
+add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches11bpcoredeprecatedbpcoredeprecatedphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-core/deprecated/bp-core-deprecated.php (2159 => 2160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-core/deprecated/bp-core-deprecated.php 2009-11-30 12:37:46 UTC (rev 2159)
+++ branches/1.1/bp-core/deprecated/bp-core-deprecated.php 2009-11-30 14:00:00 UTC (rev 2160)
</span><span class="lines">@@ -539,66 +539,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Notify user of signup success.
-function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta ) {
- global $current_site;
-
- // Send email with activation link.
- if ( 'no' == constant( "VHOST" ) ) {
- $activate_url = bp_activation_page( false ) . "?key=$key";
- } else {
- $activate_url = bp_activation_page( false ) ."?key=$key";
- }
-
- $activate_url = clean_url($activate_url);
- $admin_email = get_site_option( "admin_email" );
-
- if ( empty( $admin_email ) )
- $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-
- $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
- $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
- $message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}" ) );
- $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), clean_url('http://' . $domain . $path));
-
- wp_mail($user_email, $subject, $message, $message_headers);
-
- // Return false to stop the original WPMU function from continuing
- return false;
-}
-
-function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
- global $current_site;
-
- if( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) )
- return false;
-
- // Send email with activation link.
- $admin_email = get_site_option( "admin_email" );
- if( $admin_email == '' )
- $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
- $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
- $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
- $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key );
-
- // TODO: Don't hard code activation link.
- $subject = sprintf(__( apply_filters( 'wpmu_signup_user_notification_subject', 'Activate %s' )), $user);
- wp_mail($user_email, $subject, $message, $message_headers);
-
- // Return false to stop the original WPMU function from continuing
- return false;
-}
-
-function bp_core_load_deprecated_signup_email_functions() {
- /* If we are using a BuddyPress 1.1+ theme ignore this. */
- if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
- return false;
-
- add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
- add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
-}
-add_action( 'plugins_loaded', 'bp_core_load_deprecated_signup_email_functions' );
-
</del><span class="cx"> /*** END DEPRECATED SIGNUP FUNCTIONS **********/
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>