<!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>[39211] trunk/src/wp-admin/includes: Updates: Allow background updates to update multiple plugins/themes in the same request.</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/39211">39211</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/39211","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>2016-11-13 09:52:49 +0000 (Sun, 13 Nov 2016)</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'>Updates: Allow background updates to update multiple plugins/themes in the same request.
Due to the `clear_update_cache` parameter not being respected, update caches were being cleared incorrectly which prevented multiple plugins to be updated at the same time in background updates - failing with a `fs_unavailable` error message.
Fixes <a href="https://core.trac.wordpress.org/ticket/38024">#38024</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasspluginupgraderphp">trunk/src/wp-admin/includes/class-plugin-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasspluginupgraderphp"></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/class-plugin-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-upgrader.php 2016-11-13 07:41:30 UTC (rev 39210)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php 2016-11-13 09:52:49 UTC (rev 39211)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,8 +101,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->install_strings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_source_selection', array($this, 'check_package') );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear cache so wp_update_plugins() knows about the new plugin.
- add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['clear_update_cache'] ) {
+ // Clear cache so wp_update_plugins() knows about the new plugin.
+ add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->run( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'package' => $package,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,8 +170,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
</span><span class="cx" style="display: block; padding: 0 10px"> //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear cache so wp_update_plugins() knows about the new plugin.
- add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['clear_update_cache'] ) {
+ // Clear cache so wp_update_plugins() knows about the new plugin.
+ add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->run( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'package' => $r->package,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +231,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current = get_site_transient( 'update_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,6 +297,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maintenance_mode(false);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Force refresh of plugin update information.
+ wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'upgrader_process_complete', $this, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'update',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,12 +313,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->footer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup our hooks, in case something else does a upgrade on this connection.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
</del><span class="cx" style="display: block; padding: 0 10px"> remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Force refresh of plugin update information.
- wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $results;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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/class-theme-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php 2016-11-13 07:41:30 UTC (rev 39210)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2016-11-13 09:52:49 UTC (rev 39211)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,8 +201,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_source_selection', array($this, 'check_package') );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear cache so wp_update_themes() knows about the new theme.
- add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['clear_update_cache'] ) {
+ // Clear cache so wp_update_themes() knows about the new theme.
+ add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->run( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'package' => $package,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,8 +271,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear cache so wp_update_themes() knows about the new theme.
- add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['clear_update_cache'] ) {
+ // Clear cache so wp_update_themes() knows about the new theme.
+ add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->run( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'package' => $r['package'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,8 +333,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear cache so wp_update_themes() knows about the new theme.
- add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,6 +396,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maintenance_mode(false);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Refresh the Theme Update information
+ wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'upgrader_process_complete', $this, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'update',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,14 +412,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->footer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup our hooks, in case something else does a upgrade on this connection.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
</del><span class="cx" style="display: block; padding: 0 10px"> remove_filter('upgrader_pre_install', array($this, 'current_before'));
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter('upgrader_post_install', array($this, 'current_after'));
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Refresh the Theme Update information
- wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $results;
</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>