<!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>[12816] sites/trunk/wordpress.org/public_html/wp-content: Plugin Directory: Release Confirmation: Don't display a version in the 'Previous Versions' download form if the version was never confirmed.</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/12816">12816</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/12816","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>2023-08-08 05:38:53 +0000 (Tue, 08 Aug 2023)</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'>Plugin Directory: Release Confirmation: Don't display a version in the 'Previous Versions' download form if the version was never confirmed.
Fixes <a href="http://meta.trac.wordpress.org/ticket/5902">#5902</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsinctemplatetagsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/inc/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-directory.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/plugin-directory/class-plugin-directory.php 2023-08-08 05:23:21 UTC (rev 12815)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2023-08-08 05:38:53 UTC (rev 12816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1532,11 +1532,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tags ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tags as $tag_version => $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::add_release( $plugin, [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date' => strtotime( $tag['date'] ),
- 'tag' => $tag['tag'],
- 'version' => $tag_version,
- 'committer' => [ $tag['author'] ],
- 'confirmations_required' => 0, // Old release, assume it's released.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date' => strtotime( $tag['date'] ),
+ 'tag' => $tag['tag'],
+ 'version' => $tag_version,
+ 'committer' => [ $tag['author'] ],
+ 'zips_built' => true, // Old release, assume they were built.
+ 'confirmations_required' => 0, // Old release, assume it's released.
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,11 +1557,12 @@
</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"> self::add_release( $plugin, [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'date' => strtotime( $entry['date'] ),
- 'tag' => $entry['filename'],
- 'version' => $tag,
- 'committer' => [ $entry['author'] ],
- 'confirmations_required' => 0, // Old release, assume it's released.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'date' => strtotime( $entry['date'] ),
+ 'tag' => $entry['filename'],
+ 'version' => $tag,
+ 'committer' => [ $entry['author'] ],
+ 'zips_built' => true, // Old release, assume they were built.
+ 'confirmations_required' => 0, // Old release, assume it's released.
</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">@@ -1568,6 +1570,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $releases = get_post_meta( $plugin->ID, 'releases', true ) ?: [];
</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">+ /**
+ * If confirmations weren't required, claim that the ZIPs were built.
+ *
+ * This is needed for data pre-[12816].
+ * @see https://meta.trac.wordpress.org/changeset/12816
+ */
+ foreach ( $releases as &$release ) {
+ if ( ! $release['confirmations_required'] && ! $release['zips_built'] ) {
+ $release['zips_built'] = true;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $releases;
</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">@@ -1599,7 +1613,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'tag' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'zips_built' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assume zips built if no release confirmation.
+ 'zips_built' => ! $plugin->release_confirmation,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'confirmations' => [],
</span><span class="cx" style="display: block; padding: 0 10px"> // Confirmed by default if no release confiration.
</span><span class="cx" style="display: block; padding: 0 10px"> 'confirmed' => ! $plugin->release_confirmation,
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsinctemplatetagsphp"></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/themes/pub/wporg-plugins/inc/template-tags.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/themes/pub/wporg-plugins/inc/template-tags.php 2023-08-08 05:23:21 UTC (rev 12815)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/inc/template-tags.php 2023-08-08 05:38:53 UTC (rev 12816)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,8 +369,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<select class="previous-versions" onchange="getElementById(\'download-previous-link\').href=this.value;">';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tags as $version ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = ( 'trunk' === $version ? __( 'Development Version', 'wporg-plugins' ) : $version );
- printf( '<option value="%s">%s</option>', esc_attr( Template::download_link( $post, $version ) ), esc_html( $text ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check the tag against the confirmed releases.
+ $release = Plugin_Directory::get_release( $post, $version );
+ if ( $release && ! $release['zips_built'] ) {
+ continue;
+ }
+
+ $text = $version;
+ if ( 'trunk' === $version ) {
+ $text = __( 'Development Version', 'wporg-plugins' );
+ }
+
+ printf(
+ '<option value="%s">%s</option>',
+ esc_attr( Template::download_link( $post, $version ) ),
+ esc_html( $text )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</select> ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>