<!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>[13432] trunk/wp-includes/pluggable.php:
Remove explicit references to the post ID from moderation and comment e-mails
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13432">13432</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 17:18:59 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove explicit references to the post ID from moderation and comment e-mails. Fixes <a href="http://trac.wordpress.org/ticket/12388">#12388</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13431 => 13432)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-02-26 17:16:31 UTC (rev 13431)
+++ trunk/wp-includes/pluggable.php 2010-02-26 17:18:59 UTC (rev 13432)
</span><span class="lines">@@ -983,8 +983,7 @@
</span><span class="cx"> if ( empty( $comment_type ) ) $comment_type = 'comment';
</span><span class="cx">
</span><span class="cx"> if ('comment' == $comment_type) {
</span><del>- /* translators: 1: post id, 2: post title */
- $notify_message = sprintf( __('New comment on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('New comment on your post "%s"'),$post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: comment author, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
</span><span class="lines">@@ -995,8 +994,7 @@
</span><span class="cx"> /* translators: 1: blog name, 2: post title */
</span><span class="cx"> $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx"> } elseif ('trackback' == $comment_type) {
</span><del>- /* translators: 1: post id, 2: post title */
- $notify_message = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('New trackback on your post "%s"'), $post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: website name, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="lines">@@ -1005,8 +1003,7 @@
</span><span class="cx"> /* translators: 1: blog name, 2: post title */
</span><span class="cx"> $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx"> } elseif ('pingback' == $comment_type) {
</span><del>- /* translators: 1: post id, 2: post title */
- $notify_message = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('New pingback on your post "%s"'), $post->post_title ) . "\r\n";
</ins><span class="cx"> /* translators: 1: comment author, 2: author IP, 3: author domain */
</span><span class="cx"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="lines">@@ -1079,21 +1076,21 @@
</span><span class="cx"> switch ($comment->comment_type)
</span><span class="cx"> {
</span><span class="cx"> case 'trackback':
</span><del>- $notify_message = sprintf( __('A new trackback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="cx"> $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
</span><span class="cx"> break;
</span><span class="cx"> case 'pingback':
</span><del>- $notify_message = sprintf( __('A new pingback on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
</span><span class="cx"> $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
</span><span class="cx"> break;
</span><span class="cx"> default: //Comments
</span><del>- $notify_message = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n";
</del><ins>+ $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</ins><span class="cx"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx"> $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
</span></span></pre>
</div>
</div>
</body>
</html>