<!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>[15552] trunk/wp-includes/ms-functions.php:
Pass more info to notification filters.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15552">15552</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-08-31 18:19:15 +0000 (Tue, 31 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass more info to notification filters. Props mdawaffe. fixes <a href="http://trac.wordpress.org/ticket/14743">#14743</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15551 => 15552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-08-31 18:17:20 UTC (rev 15551)
+++ trunk/wp-includes/ms-functions.php 2010-08-31 18:19:15 UTC (rev 15552)
</span><span class="lines">@@ -654,9 +654,24 @@
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx"> $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="cx"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><del>- $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "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 site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
</del><ins>+ $message = sprintf(
+ apply_filters( 'wpmu_signup_blog_notification_email',
+ __( "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 site here:\n\n%s" ),
+ $domain, $path, $title, $user, $user_email, $key, $meta
+ ),
+ $activate_url,
+ esc_url( "http://{$domain}{$path}" ),
+ $key
+ );
</ins><span class="cx"> // TODO: Don't hard code activation link.
</span><del>- $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1$s] Activate %2$s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
</del><ins>+ $subject = sprintf(
+ apply_filters( 'wpmu_signup_blog_notification_subject',
+ __( '[%1$s] Activate %2$s' ),
+ $domain, $path, $title, $user, $user_email, $key, $meta
+ ),
+ $from_name,
+ esc_url( 'http://' . $domain . $path )
+ );
</ins><span class="cx"> wp_mail($user_email, $subject, $message, $message_headers);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -671,9 +686,23 @@
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx"> $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="cx"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><del>- $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 );
</del><ins>+ $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" ),
+ $user, $user_email, $key, $meta
+ ),
+ site_url( "wp-activate.php?key=$key" ),
+ $key
+ );
</ins><span class="cx"> // TODO: Don't hard code activation link.
</span><del>- $subject = sprintf( __( apply_filters( 'wpmu_signup_user_notification_subject', '[%1$s] Activate %2$s' ) ), $from_name, $user);
</del><ins>+ $subject = sprintf(
+ apply_filters( 'wpmu_signup_user_notification_subject',
+ __( '[%1$s] Activate %2$s' ),
+ $user, $user_email, $key, $meta
+ ),
+ $from_name,
+ $user
+ );
</ins><span class="cx"> wp_mail($user_email, $subject, $message, $message_headers);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>