<!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>[49167] Upgrade/Install: Check if plugin or theme update results are available before applying the notification filters.</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="https://core.trac.wordpress.org/changeset/49167">49167</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/49167","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>2020-10-15 23:29:17 +0000 (Thu, 15 Oct 2020)</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'>Upgrade/Install: Check if plugin or theme update results are available before applying the notification filters.
This avoids a PHP notice for an undefined index of either `plugin` or `theme` in the `auto_{plugin|theme}_update_send_email` filter hook.
Props afragen, audrasjb.
Merges <a href="https://core.trac.wordpress.org/changeset/49166">[49166]</a> to the 5.5 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/51400">#51400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches55srcwpadminincludesclasswpautomaticupdaterphp">branches/5.5/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches55">branches/5.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.5
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.5 2020-10-15 23:25:19 UTC (rev 49166)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.5 2020-10-15 23:29:17 UTC (rev 49167)
</ins><a id="branches55"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:48685-48686,48688-48689,48696,48701,48703,48707,48717,48719,48721,48725-48726,48729-48731,48734,48736,48742,48745,48748-48751,48757-48758,48761,48767,48770,48772,48775,48777-48778,48783,48792,48796-48797,48800-48802,48808-48809,48814,48817,48820,48827,48832,48842,48850,48852-48853,48856,48859,48862,48864,48866,48868,48870,48872,48874,48876,48878,48880-48881,48884,48886,48888,48890,48892,48894-48895,48897,48899,48904,48908-48913,48918,48923-48924,48938,48946,48958
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:48685-48686,48688-48689,48696,48701,48703,48707,48717,48719,48721,48725-48726,48729-48731,48734,48736,48742,48745,48748-48751,48757-48758,48761,48767,48770,48772,48775,48777-48778,48783,48792,48796-48797,48800-48802,48808-48809,48814,48817,48820,48827,48832,48842,48850,48852-48853,48856,48859,48862,48864,48866,48868,48870,48872,48874,48876,48878,48880-48881,48884,48886,48888,48890,48892,48894-48895,48897,48899,48904,48908-48913,48918,48923-48924,48938,48946,48958,49166
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches55srcwpadminincludesclasswpautomaticupdaterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.5/src/wp-admin/includes/class-wp-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.5/src/wp-admin/includes/class-wp-automatic-updater.php 2020-10-15 23:25:19 UTC (rev 49166)
+++ branches/5.5/src/wp-admin/includes/class-wp-automatic-updater.php 2020-10-15 23:29:17 UTC (rev 49167)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,44 +887,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $successful_updates = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $failed_updates = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters whether to send an email following an automatic background plugin update.
- *
- * @since 5.5.0
- * @since 5.5.1 Added the $update_results parameter.
- *
- * @param bool $enabled True if plugins notifications are enabled, false otherwise.
- * @param array $update_results The results of plugins update tasks.
- */
- $notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $update_results['plugin'] ) ) {
+ /**
+ * Filters whether to send an email following an automatic background plugin update.
+ *
+ * @since 5.5.0
+ * @since 5.5.1 Added the `$update_results` parameter.
+ *
+ * @param bool $enabled True if plugin update notifications are enabled, false otherwise.
+ * @param array $update_results The results of plugins update tasks.
+ */
+ $notifications_enabled = apply_filters( 'auto_plugin_update_send_email', true, $update_results['plugin'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $update_results['plugin'] ) && $notifications_enabled ) {
- foreach ( $update_results['plugin'] as $update_result ) {
- if ( true === $update_result->result ) {
- $successful_updates['plugin'][] = $update_result;
- } else {
- $failed_updates['plugin'][] = $update_result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $notifications_enabled ) {
+ foreach ( $update_results['plugin'] as $update_result ) {
+ if ( true === $update_result->result ) {
+ $successful_updates['plugin'][] = $update_result;
+ } else {
+ $failed_updates['plugin'][] = $update_result;
+ }
</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 class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters whether to send an email following an automatic background theme update.
- *
- * @since 5.5.0
- * @since 5.5.1 Added the $update_results parameter.
- *
- * @param bool $enabled True if notifications are enabled, false otherwise.
- * @param array $update_results The results of theme update tasks.
- */
- $notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $update_results['theme'] ) ) {
+ /**
+ * Filters whether to send an email following an automatic background theme update.
+ *
+ * @since 5.5.0
+ * @since 5.5.1 Added the `$update_results` parameter.
+ *
+ * @param bool $enabled True if theme update notifications are enabled, false otherwise.
+ * @param array $update_results The results of theme update tasks.
+ */
+ $notifications_enabled = apply_filters( 'auto_theme_update_send_email', true, $update_results['theme'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $update_results['theme'] ) && $notifications_enabled ) {
- foreach ( $update_results['theme'] as $update_result ) {
- if ( true === $update_result->result ) {
- $successful_updates['theme'][] = $update_result;
- } else {
- $failed_updates['theme'][] = $update_result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $notifications_enabled ) {
+ foreach ( $update_results['theme'] as $update_result ) {
+ if ( true === $update_result->result ) {
+ $successful_updates['theme'][] = $update_result;
+ } else {
+ $failed_updates['theme'][] = $update_result;
+ }
</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>