<!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" />
<title>[31403] trunk/src: Replace generic "Dear user" greeting in email notifications with a more personalized one.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31403">31403</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31403","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-10 07:46:50 +0000 (Tue, 10 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Replace generic "Dear user" greeting in email notifications with a more personalized one.
props Ipstenu.
fixes <a href="https://core.trac.wordpress.org/ticket/31217">#31217</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-02-10 05:44:21 UTC (rev 31402)
+++ trunk/src/wp-admin/includes/ms.php 2015-02-10 07:46:50 UTC (rev 31403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,10 +253,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'adminhash', $new_admin_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_text = __( 'Dear user,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_text = __( 'Howdy ###USERNAME###,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> You recently requested to have the administration email address on
</span><span class="cx" style="display: block; padding: 0 10px"> your site changed.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> If this is correct, please click on the following link to change it:
</span><span class="cx" style="display: block; padding: 0 10px"> ###ADMIN_URL###
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,6 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the email text sent when the site admin email is changed.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The following strings have a special meaning and will get replaced dynamically:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * ###USERNAME### The current user's username.
</ins><span class="cx" style="display: block; padding: 0 10px"> * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
</span><span class="cx" style="display: block; padding: 0 10px"> * ###EMAIL### The new email.
</span><span class="cx" style="display: block; padding: 0 10px"> * ###SITENAME### The name of the site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,6 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $value, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,9 +334,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $current_user->ID . '_new_email', $new_user_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_text = __( 'Dear user,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_text = __( 'Howdy ###USERNAME###,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> You recently requested to have the email address on your account changed.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> If this is correct, please click on the following link to change it:
</span><span class="cx" style="display: block; padding: 0 10px"> ###ADMIN_URL###
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,6 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the email text sent when a user changes emails.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The following strings have a special meaning and will get replaced dynamically:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * ###USERNAME### The current user's username.
</ins><span class="cx" style="display: block; padding: 0 10px"> * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
</span><span class="cx" style="display: block; padding: 0 10px"> * ###EMAIL### The new email.
</span><span class="cx" style="display: block; padding: 0 10px"> * ###SITENAME### The name of the site.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,6 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $_POST['email'], $content);
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2015-02-10 05:44:21 UTC (rev 31402)
+++ trunk/src/wp-admin/includes/schema.php 2015-02-10 07:46:50 UTC (rev 31403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +917,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_admins = get_site_option( 'site_admins' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = __( 'Dear User,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = __( 'Howdy USERNAME,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Your new SITE_NAME site has been successfully set up at:
</span><span class="cx" style="display: block; padding: 0 10px"> BLOG_URL
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2015-02-10 05:44:21 UTC (rev 31402)
+++ trunk/src/wp-admin/ms-delete-site.php 2015-02-10 07:46:50 UTC (rev 31403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = get_blog_details();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user = wp_get_current_user();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Delete Site' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'tools.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +43,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = __( "Dear User,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = __( "Howdy ###USERNAME###,
+
</ins><span class="cx" style="display: block; padding: 0 10px"> You recently clicked the 'Delete Site' link on your site and filled in a
</span><span class="cx" style="display: block; padding: 0 10px"> form on that page.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> If you really want to delete your site, click the link below. You will not
</span><span class="cx" style="display: block; padding: 0 10px"> be asked to confirm again so only click this link if you are absolutely certain:
</span><span class="cx" style="display: block; padding: 0 10px"> ###URL_DELETE###
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'delete_site_email_content', $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###USERNAME###', $user->user_login, $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###URL_DELETE###', $url_delete, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2015-02-10 05:44:21 UTC (rev 31402)
+++ trunk/src/wp-includes/ms-functions.php 2015-02-10 07:46:50 UTC (rev 31403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1434,7 +1434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = get_site_option( 'welcome_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $welcome_email == false )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome_email = __( 'Dear User,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome_email = __( 'Howdy USERNAME,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Your new SITE_NAME site has been successfully set up at:
</span><span class="cx" style="display: block; padding: 0 10px"> BLOG_URL
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2080,7 +2080,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function welcome_user_msg_filter( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = __( 'Dear User,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $text = __( 'Howdy USERNAME,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Your new account is set up.
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>