<!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>[12178] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Release Confirmation: Update the copy of the release-confirmations-enabled email.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/12178">12178</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12178","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-11-01 07:51:18 +0000 (Tue, 01 Nov 2022)</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'>Plugin Directory: Release Confirmation: Update the copy of the release-confirmations-enabled email.

Fixes <a href="http://meta.trac.wordpress.org/ticket/5698">#5698</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreleaseconfirmationphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryemailclassbasephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryemailclassreleaseconfirmationenabledphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-release-confirmation-enabled.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasspluginreleaseconfirmationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php        2022-11-01 07:12:44 UTC (rev 12177)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-release-confirmation.php  2022-11-01 07:51:18 UTC (rev 12178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $email = new Release_Confirmation_Enabled_Email(
</span><span class="cx" style="display: block; padding: 0 10px">                        $plugin,
</span><span class="cx" style="display: block; padding: 0 10px">                        Tools::get_plugin_committers( $plugin->post_name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        []
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 [
+                               // Don't include the plugin reviewer who triggered this.
+                               'who' => is_admin() ? 'WordPress.org' : null,
+                       ]
</ins><span class="cx" style="display: block; padding: 0 10px">                 );
</span><span class="cx" style="display: block; padding: 0 10px">                $email->send();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryemailclassbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php    2022-11-01 07:12:44 UTC (rev 12177)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php      2022-11-01 07:51:18 UTC (rev 12178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +167,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * This shouldn't be needed, but unfortunately often is on WordPress.org.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function user_text( $user ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Allow passing 'who=WordPress.org' instead of a user object.
+               if ( 'WordPress.org' === $user ) {
+                       return 'WordPress.org';
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $user instanceof WP_User ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $user = new WP_User( $user );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryemailclassreleaseconfirmationenabledphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-release-confirmation-enabled.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-release-confirmation-enabled.php    2022-11-01 07:12:44 UTC (rev 12177)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-release-confirmation-enabled.php      2022-11-01 07:51:18 UTC (rev 12178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,19 +15,26 @@
</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">        function body() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                /* translators: 1: Plugin Author, 2: Plugin Name, 3: URL to the handbook */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /* translators: 1: Plugin Author, 2: User Name, 5: Plugin Name, 4: Plugin URL, 5: Plugin slug, 6: URL to the handbook */
</ins><span class="cx" style="display: block; padding: 0 10px">                 return sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                        __( 'Howdy %1$s,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Release confirmations are now enabled for %2$s.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+%2$s has enabled release confirmations for the following plugin:
+%3$s
+%4$s
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-This means that each time you release a new version of %2$s you\'ll be required to confirm the release by following a link in an automated email.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+A new email will be sent to all committers when a new pending release exists for %5$s with a link to the Release Management dashboard.
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+You, or another committer to the plugin, will be required to confirm the release on that dashboard before WordPress.org processes the newly committed plugin update.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> For more information, please read the following handbook article:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-%3$s', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+%6$s', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->user_text( $this->user ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $this->user_text( $this->who ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         $this->plugin->post_title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'https://developer.wordpress.org/plugins/wordpress-org/' // TODO: Handbook page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 get_permalink( $this->plugin ),
+                       $this->plugin->post_name,
+                       'https://developer.wordpress.org/plugins/wordpress-org/release-confirmation-emails/'
</ins><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"> }
</span></span></pre>
</div>
</div>

</body>
</html>