<!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] [2219] trunk/bp-core: Fixing activation link.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2219</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-27 20:46:11 +0000 (Sun, 27 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing activation link.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreactivationphp">trunk/bp-core/bp-core-activation.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.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 (2218 => 2219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-activation.php 2009-12-27 20:01:21 UTC (rev 2218)
+++ trunk/bp-core/bp-core-activation.php 2009-12-27 20:46:11 UTC (rev 2219)
</span><span class="lines">@@ -123,13 +123,7 @@
</span><span class="cx"> function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
</span><span class="cx"> global $current_site;
</span><span class="cx">
</span><del>- // 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";
- }
-
</del><ins>+ $activate_url = bp_get_activation_page() ."?key=$key";
</ins><span class="cx"> $activate_url = clean_url($activate_url);
</span><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx">
</span><span class="lines">@@ -138,9 +132,11 @@
</span><span class="cx">
</span><span class="cx"> $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
</span><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><del>- $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));
</del><ins>+ $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 . '] ' . __( 'Activate Your Account', 'buddypress' );
</ins><span class="cx">
</span><ins>+
+ var_dump($user_email, $subject, $message, $message_headers); die;
</ins><span class="cx"> wp_mail($user_email, $subject, $message, $message_headers);
</span><span class="cx">
</span><span class="cx"> // Return false to stop the original WPMU function from continuing
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2218 => 2219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-12-27 20:01:21 UTC (rev 2218)
+++ trunk/bp-core/bp-core-templatetags.php 2009-12-27 20:46:11 UTC (rev 2219)
</span><span class="lines">@@ -921,12 +921,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_has_custom_activation_page() {
</span><del>- if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/activate.php') )
</del><ins>+ if ( locate_template( array( 'activate.php' ), false ) || locate_template( array( '/registration/activate.php' ), false ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template') . '/registration/activate.php') )
- return true;
-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>