<!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>[52192] trunk/src: Upgrade/Install: Correct the weekly cron event for clearing the `temp-backup` directory:</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/52192">52192</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/52192","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>2021-11-16 22:18:32 +0000 (Tue, 16 Nov 2021)</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: Correct the weekly cron event for clearing the `temp-backup` directory:

* Make sure the `wp_delete_temp_updater_backups` event has an action associated with it when it runs.
* Check if the cron event already exists before scheduling it, to avoid scheduling duplicate events. 
* Move the code for clearing the `temp-backup` directory to a standalone function.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/51815">[51815]</a>, <a href="https://core.trac.wordpress.org/changeset/51898">[51898]</a>, <a href="https://core.trac.wordpress.org/changeset/51899">[51899]</a>.

Props pbiron, johnbillion.
See <a href="https://core.trac.wordpress.org/ticket/51857">#51857</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></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-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2021-11-16 21:46:24 UTC (rev 52191)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php   2021-11-16 22:18:32 UTC (rev 52192)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +150,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected function schedule_temp_backup_cleanup() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_schedule_event( time(), 'weekly', 'delete_temp_updater_backups' );
-               add_action( 'delete_temp_updater_backups', array( $this, 'delete_all_temp_backups' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( false === wp_next_scheduled( 'wp_delete_temp_updater_backups' ) ) {
+                       wp_schedule_event( time(), 'weekly', 'wp_delete_temp_updater_backups' );
+               }
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,51 +1108,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        true
</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">-
-       /**
-        * Deletes all contents of the temp-backup directory.
-        *
-        * @since 5.9.0
-        *
-        * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
-        */
-       public function delete_all_temp_backups() {
-               /*
-                * Check if there's a lock, or if currently performing an Ajax request,
-                * in which case there's a chance we're doing an update.
-                * Reschedule for an hour from now and exit early.
-                */
-               if ( get_option( 'core_updater.lock' ) || get_option( 'auto_updater.lock' ) || wp_doing_ajax() ) {
-                       wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'delete_temp_updater_backups' );
-                       return;
-               }
-
-               add_action(
-                       'shutdown',
-                       /*
-                        * This action runs on shutdown to make sure there's no plugin updates currently running.
-                        * Using a closure in this case is OK since the action can be removed by removing the parent hook.
-                        */
-                       function() {
-                               global $wp_filesystem;
-
-                               if ( ! $wp_filesystem ) {
-                                       include_once ABSPATH . '/wp-admin/includes/file.php';
-                                       WP_Filesystem();
-                               }
-
-                               $dirlist = $wp_filesystem->dirlist( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' );
-
-                               foreach ( array_keys( $dirlist ) as $dir ) {
-                                       if ( '.' === $dir || '..' === $dir ) {
-                                               continue;
-                                       }
-
-                                       $wp_filesystem->delete( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' . $dir, true );
-                               }
-                       }
-               );
-       }
</del><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"> /** Plugin_Upgrader class */
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php  2021-11-16 21:46:24 UTC (rev 52191)
+++ trunk/src/wp-includes/update.php    2021-11-16 22:18:32 UTC (rev 52192)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,6 +956,51 @@
</span><span class="cx" style="display: block; padding: 0 10px">        delete_site_transient( 'update_core' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Deletes all contents of the temp-backup directory.
+ *
+ * @since 5.9.0
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ */
+function wp_delete_all_temp_backups() {
+       /*
+        * Check if there's a lock, or if currently performing an Ajax request,
+        * in which case there's a chance we're doing an update.
+        * Reschedule for an hour from now and exit early.
+        */
+       if ( get_option( 'core_updater.lock' ) || get_option( 'auto_updater.lock' ) || wp_doing_ajax() ) {
+               wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_delete_temp_updater_backups' );
+               return;
+       }
+
+       add_action(
+               'shutdown',
+               /*
+                * This action runs on shutdown to make sure there's no plugin updates currently running.
+                * Using a closure in this case is OK since the action can be removed by removing the parent hook.
+                */
+               function() {
+                       global $wp_filesystem;
+
+                       if ( ! $wp_filesystem ) {
+                               include_once ABSPATH . '/wp-admin/includes/file.php';
+                               WP_Filesystem();
+                       }
+
+                       $dirlist = $wp_filesystem->dirlist( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' );
+
+                       foreach ( array_keys( $dirlist ) as $dir ) {
+                               if ( '.' === $dir || '..' === $dir ) {
+                                       continue;
+                               }
+
+                               $wp_filesystem->delete( $wp_filesystem->wp_content_dir() . 'upgrade/temp-backup/' . $dir, true );
+                       }
+               }
+       );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! is_main_site() && ! is_network_admin() ) || wp_doing_ajax() ) {
</span><span class="cx" style="display: block; padding: 0 10px">        return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -980,3 +1025,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'wp_schedule_update_checks' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+add_action( 'wp_delete_temp_updater_backups', 'wp_delete_all_temp_backups' );
</ins></span></pre>
</div>
</div>

</body>
</html>