<!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>[25885] branches/3.7: Introduce a send_core_update_notification_email filter to control whether to send update notifications.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25885">25885</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-10-23 19:53:21 +0000 (Wed, 23 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a send_core_update_notification_email filter to control whether to send update notifications.
Merges <a href="http://core.trac.wordpress.org/changeset/25882">[25882]</a> to the 3.7 branch.
Currently, this is dependent on whether the automatic updater is enabled (generally). This is likely to be decoupled in a future release.
This refocuses the auto_core_update_send_email filter to specifically be for success/fail emails for auto updates, while the new filter is more general.
see <a href="http://core.trac.wordpress.org/ticket/25603">#25603</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpadminincludesclasswpupgraderphp">branches/3.7/src/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37">branches/3.7/</a></li>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.7
</span><span class="cx">===================================================================
</span><del>--- branches/3.7 2013-10-23 19:50:30 UTC (rev 25884)
</del><ins>+++ branches/3.7 2013-10-23 19:53:21 UTC (rev 25885)
</ins><a id="branches37"></a>
<div class="propset"><h4>Property changes: branches/3.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512
</del><ins>+/trunk:18512,25882
</ins><span class="cx">\ No newline at end of property
</span><span class="cx">Index: branches/3.7/src
</span><span class="cx">===================================================================
</span><del>--- branches/3.7/src 2013-10-23 19:50:30 UTC (rev 25884)
</del><ins>+++ branches/3.7/src 2013-10-23 19:53:21 UTC (rev 25885)
</ins><a id="branches37src"></a>
<div class="propset"><h4>Property changes: branches/3.7/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1/src:18031
</span><span class="cx"> /branches/3.3/src:20543
</span><span class="cx"> /branches/3.4/src:21757
</span><del>-/trunk/src:18512,25880
</del><ins>+/trunk/src:18512,25880,25882
</ins><span class="cx">\ No newline at end of property
</span><a id="branches37srcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/class-wp-upgrader.php (25884 => 25885)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/class-wp-upgrader.php 2013-10-23 19:50:30 UTC (rev 25884)
+++ branches/3.7/src/wp-admin/includes/class-wp-upgrader.php 2013-10-23 19:53:21 UTC (rev 25885)
</span><span class="lines">@@ -1739,7 +1739,7 @@
</span><span class="cx"> // If we can't do an auto core update, we may still be able to email the user.
</span><span class="cx"> if ( ! $skin->request_filesystem_credentials( false, $context ) || $this->is_vcs_checkout( $context ) ) {
</span><span class="cx"> if ( 'core' == $type )
</span><del>- $this->notify_core_update( $item );
</del><ins>+ $this->send_core_update_notification_email( $item );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1770,7 +1770,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! $update ) {
</span><span class="cx"> if ( 'core' == $type )
</span><del>- $this->notify_core_update( $item );
</del><ins>+ $this->send_core_update_notification_email( $item );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1798,11 +1798,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object $item The update offer.
</span><span class="cx"> */
</span><del>- protected function notify_core_update( $item ) {
- // See if we need to notify users of a core update.
- if ( empty( $item->notify_email ) )
- return false;
-
</del><ins>+ protected function send_core_update_notification_email( $item ) {
</ins><span class="cx"> $notify = true;
</span><span class="cx"> $notified = get_site_option( 'auto_core_update_notified' );
</span><span class="cx">
</span><span class="lines">@@ -1810,6 +1806,28 @@
</span><span class="cx"> if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // See if we need to notify users of a core update.
+ $notify = ! empty( $item->notify_email );
+
+ /**
+ * Whether to notify the site administrator of a new core update.
+ *
+ * By default, administrators are notified when the update offer received from WordPress.org
+ * sets a particular flag. This allows for discretion in if and when to notify.
+ *
+ * This filter only fires once per release -- if the same email address was already
+ * notified of the same new version, we won't repeatedly email the administrator.
+ *
+ * This filter is also used on about.php to check if a plugin has disabled these notifications.
+ *
+ * @since 3.7.0
+ *
+ * @param bool $notify Whether the site administrator is notified.
+ * @param object $item The update offer.
+ */
+ if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) )
+ return false;
+
</ins><span class="cx"> $this->send_email( 'manual', $item );
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -2127,11 +2145,11 @@
</span><span class="cx"> * @since 3.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $send Whether to send the email. Default true.
</span><del>- * @param string $type The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
</del><ins>+ * @param string $type The type of email to send. Can be one of 'success', 'fail', 'critical'.
</ins><span class="cx"> * @param object $core_update The update offer that was attempted.
</span><span class="cx"> * @param mixed $result The result for the core update. Can be WP_Error.
</span><span class="cx"> */
</span><del>- if ( ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
</del><ins>+ if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> switch ( $type ) {
</span></span></pre>
</div>
</div>
</body>
</html>