<!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] [3144] branches/1.2: Fixes #2526 props cnorris23</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3144</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-07-22 10:56:33 +0000 (Thu, 22 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2526 props cnorris23</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
<li><a href="#branches12bpcorebpcorecatchuriphp">branches/1.2/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#branches12bpcorebpcorefiltersphp">branches/1.2/bp-core/bp-core-filters.php</a></li>
<li><a href="#branches12bpcorebpcoresignupphp">branches/1.2/bp-core/bp-core-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (3143 => 3144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-07-22 10:51:24 UTC (rev 3143)
+++ branches/1.2/bp-activity.php 2010-07-22 10:56:33 UTC (rev 3144)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> if ( is_user_logged_in() )
</span><span class="cx"> bp_core_redirect( $bp->loggedin_user->domain );
</span><span class="cx"> else
</span><del>- bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . clean_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
</del><ins>+ bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'members/single/activity/permalink' ) );
</span></span></pre></div>
<a id="branches12bpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-catchuri.php (3143 => 3144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-catchuri.php 2010-07-22 10:51:24 UTC (rev 3143)
+++ branches/1.2/bp-core/bp-core-catchuri.php 2010-07-22 10:56:33 UTC (rev 3144)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> if ( strpos( $_SERVER['REQUEST_URI'], 'wp-load.php' ) )
</span><span class="cx"> $path = bp_core_referrer();
</span><span class="cx"> else
</span><del>- $path = clean_url( $_SERVER['REQUEST_URI'] );
</del><ins>+ $path = esc_url( $_SERVER['REQUEST_URI'] );
</ins><span class="cx">
</span><span class="cx"> $path = apply_filters( 'bp_uri', $path );
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-filters.php (3143 => 3144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-filters.php 2010-07-22 10:51:24 UTC (rev 3143)
+++ branches/1.2/bp-core/bp-core-filters.php 2010-07-22 10:56:33 UTC (rev 3144)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> // Send email with activation link.
</span><span class="cx"> $activate_url = bp_get_activation_page() ."?key=$key";
</span><del>- $activate_url = clean_url($activate_url);
</del><ins>+ $activate_url = esc_url($activate_url);
</ins><span class="cx">
</span><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx">
</span><span class="lines">@@ -174,8 +174,8 @@
</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 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));
</del><ins>+ $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, esc_url("http://{$domain}{$path}" ) );
+ $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), esc_url('http://' . $domain . $path));
</ins><span class="cx">
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_core_activation_signup_blog_notification_to', $user_email );
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> global $current_site;
</span><span class="cx">
</span><span class="cx"> $activate_url = bp_get_activation_page() ."?key=$key";
</span><del>- $activate_url = clean_url($activate_url);
</del><ins>+ $activate_url = esc_url($activate_url);
</ins><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx">
</span><span class="cx"> if ( empty( $admin_email ) )
</span><span class="lines">@@ -206,7 +206,7 @@
</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 . $email, 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 . $email, esc_url( "http://{$domain}{$path}" ) );
</ins><span class="cx"> $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> /* Send the message */
</span></span></pre></div>
<a id="branches12bpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-signup.php (3143 => 3144)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-signup.php 2010-07-22 10:51:24 UTC (rev 3143)
+++ branches/1.2/bp-core/bp-core-signup.php 2010-07-22 10:56:33 UTC (rev 3144)
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx">
</span><span class="cx"> function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
</span><span class="cx"> $activate_url = bp_get_activation_page() ."?key=$key";
</span><del>- $activate_url = clean_url( $activate_url );
</del><ins>+ $activate_url = esc_url( $activate_url );
</ins><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx">
</span><span class="cx"> if ( empty( $admin_email ) )
</span></span></pre>
</div>
</div>
</body>
</html>