<!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>[13758] sites/trunk: Theme Directory: Add additional checks to the themes api before marking a theme as 404.</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="http://meta.trac.wordpress.org/changeset/13758">13758</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13758","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>2024-05-30 04:21:10 +0000 (Thu, 30 May 2024)</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'>Theme Directory: Add additional checks to the themes api before marking a theme as 404.
This checks that there were no DB errors on the pageload, and that we don't have any cached update-check data.
This should reduce the chances of a query failure causing a theme to be marked as missing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlthemesinfo10indexphp">sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemesapiphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/themes-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlthemesinfo10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php 2024-05-29 09:54:18 UTC (rev 13757)
+++ sites/trunk/api.wordpress.org/public_html/themes/info/1.0/index.php 2024-05-30 04:21:10 UTC (rev 13758)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,6 +146,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo $api->get_result( $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cache when a theme doesn't exist. See the validation handler above.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'theme_information' == $action && isset( $slug ) && 404 == http_response_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if (
+ 'theme_information' == $action &&
+ isset( $slug ) &&
+ 404 == http_response_code() &&
+ // Validate that the theme doesn't exist for update-checks, as a sanity check.
+ ! wp_cache_get( $slug, 'theme-update-check' ) &&
+ // And that there were no DB errors.
+ empty( $wpdb->last_error )
+) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $slug, 'not_found', 'theme_information_error', WEEK_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemesapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/themes-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/themes-api.php 2024-05-29 09:54:18 UTC (rev 13757)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/themes-api.php 2024-05-30 04:21:10 UTC (rev 13758)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Adjustments for the Themes API.
</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">+// Mark it as a global group whenever the theme directory is loaded.
+wp_cache_add_global_groups( 'theme-update-check' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Updates the update-check cache when a new version of a theme gets approved.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $current_version The approved theme version.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_update_check( $post_id, $current_version ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug = get_post( $post_id )->post_name;
- $cache_group = 'theme-update-check';
- wp_cache_add_global_groups( $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slug = get_post( $post_id )->post_name;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_meta = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'current_version' => $current_version,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'requires_php' => wporg_themes_get_version_meta( $post_id, '_requires_php', $current_version ),
</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">- wp_cache_set( $slug, $theme_meta, $cache_group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_set( $slug, $theme_meta, 'theme-update-check' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete the error cache if this theme is new.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( $slug, 'theme_information_error' );
</span></span></pre>
</div>
</div>
</body>
</html>