<!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>[41963] trunk/src: Transients: Clear expired transients from the database in a daily cron task.</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/41963">41963</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/41963","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>2017-10-21 13:21:24 +0000 (Sat, 21 Oct 2017)</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'>Transients: Clear expired transients from the database in a daily cron task.
Fixes <a href="https://core.trac.wordpress.org/ticket/41699">#41699</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesschemaphp"></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/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2017-10-21 11:54:47 UTC (rev 41962)
+++ trunk/src/wp-admin/includes/schema.php 2017-10-21 13:21:24 UTC (rev 41963)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,27 +584,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete obsolete magpie stuff.
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
</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 expired transients. The multi-table delete syntax is used
- * to delete the transient record from table a, and the corresponding
- * transient_timeout record from table b.
- */
- $time = time();
- $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
- WHERE a.option_name LIKE %s
- AND a.option_name NOT LIKE %s
- AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
- AND b.option_value < %d";
- $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
-
- if ( is_main_site() && is_main_network() ) {
- $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
- WHERE a.option_name LIKE %s
- AND a.option_name NOT LIKE %s
- AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
- AND b.option_value < %d";
- $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Clear expired transients
+ delete_expired_transients( true );
</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>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2017-10-21 11:54:47 UTC (rev 41962)
+++ trunk/src/wp-admin/includes/upgrade.php 2017-10-21 13:21:24 UTC (rev 41963)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1746,21 +1746,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function upgrade_network() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Always.
- if ( is_main_network() ) {
- /*
- * Deletes all expired transients. The multi-table delete syntax is used
- * to delete the transient record from table a, and the corresponding
- * transient_timeout record from table b.
- */
- $time = time();
- $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b
- WHERE a.meta_key LIKE %s
- AND a.meta_key NOT LIKE %s
- AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
- AND b.meta_value < %d";
- $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Always clear expired transients
+ delete_expired_transients( true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 2.8.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 11549 ) {
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2017-10-21 11:54:47 UTC (rev 41962)
+++ trunk/src/wp-includes/default-filters.php 2017-10-21 13:21:24 UTC (rev 41963)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,14 +317,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
-add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'welcome_panel', 'wp_welcome_panel' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Cron tasks
+add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
+add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' );
+add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
+add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
+add_action( 'delete_expired_transients', 'delete_expired_transients' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Navigation menu actions
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'delete_term', '_wp_delete_tax_menu_item', 10, 3 );
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></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/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2017-10-21 11:54:47 UTC (rev 41962)
+++ trunk/src/wp-includes/option.php 2017-10-21 13:21:24 UTC (rev 41963)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,6 +817,61 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Deletes all expired transients.
+ *
+ * The multi-table delete syntax is used to delete the transient record
+ * from table a, and the corresponding transient_timeout record from table b. +
+ *
+ * @since 4.9.0
+ *
+ * @param bool $force_db Optional. Force cleanup to run against the database even when an external object cache is used.
+ */
+function delete_expired_transients( $force_db = false) {
+ global $wpdb;
+
+ if ( ! $force_db && wp_using_ext_object_cache() ) {
+ return;
+ }
+
+ $wpdb->query( $wpdb->prepare(
+ "DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+ WHERE a.option_name LIKE %s
+ AND a.option_name NOT LIKE %s
+ AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
+ AND b.option_value < %d",
+ $wpdb->esc_like( '_transient_' ) . '%',
+ $wpdb->esc_like( '_transient_timeout_' ) . '%',
+ time()
+ ) );
+
+ if ( ! is_multisite() ) {
+ // non-Multisite stores site transients in the options table.
+ $wpdb->query( $wpdb->prepare(
+ "DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+ WHERE a.option_name LIKE %s
+ AND a.option_name NOT LIKE %s
+ AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
+ AND b.option_value < %d",
+ $wpdb->esc_like( '_site_transient_' ) . '%',
+ $wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+ time()
+ ) );
+ } elseif ( is_multisite() && is_main_site() && is_main_network() ) {
+ // Multisite stores site transients in the sitemeta table.
+ $wpdb->query( $wpdb->prepare(
+ "DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
+ WHERE a.meta_key LIKE %s
+ AND a.meta_key NOT LIKE %s
+ AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
+ AND b.meta_value < %d",
+ $wpdb->esc_like( '_site_transient_' ) . '%',
+ $wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+ time()
+ ) );
+ }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Saves and restores user interface settings stored in a cookie.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Checks if the current user-settings cookie is updated and stores it. When no
</span></span></pre>
</div>
</div>
</body>
</html>