<!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>[1382] sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php: WP.org Themes: Add the ability to properly handle ticket reopenings.</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="http://meta.trac.wordpress.org/changeset/1382">1382</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/1382","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-06 02:22:56 +0000 (Fri, 06 Mar 2015)</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'>WP.org Themes: Add the ability to properly handle ticket reopenings.
In case a final approved ticket gets reopened, it sets the previous live
version to live again.
Fixes <a href="http://meta.trac.wordpress.org/ticket/926">#926</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></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/theme-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/theme-directory/theme-directory.php 2015-03-05 20:44:45 UTC (rev 1381)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-03-06 02:22:56 UTC (rev 1382)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,8 +275,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_update_version_status( $post_id, $current_version, $new_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = get_post_meta( $post_id, '_status', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_post_meta( $post_id, '_status', true );
+ $old_status = $meta[ $current_version ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't do anything when the status hasn't changed.
+ if ( $new_status == $old_status ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $new_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // There can only be one version with these statuses:
</span><span class="cx" style="display: block; padding: 0 10px"> case 'new':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,8 +308,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $current_version The theme version that was updated.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $new_status The new status for that theme version.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $old_status The old status for that theme version.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'wporg_themes_update_version_status', $post_id, $current_version, $new_status );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'wporg_themes_update_version_status', $post_id, $current_version, $new_status, $old_status );
</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"> * The dynamic portion of the hook name, `$new_status`, refers to the new
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,8 +318,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $current_version The theme version that was updated.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $old_status The old status for that theme version.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( "wporg_themes_update_version_{$new_status}", $post_id, $current_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( "wporg_themes_update_version_{$new_status}", $post_id, $current_version, $old_status );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return update_post_meta( $post_id, '_status', $meta );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,9 +332,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $old_status
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wporg_themes_approve_version( $post_id, $version ) {
- $post = get_post( $post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wporg_themes_approve_version( $post_id, $version, $old_status ) {
+ $post = get_post( $post_id );
+
+ wporg_themes_update_wpthemescom( $post->post_name, $version );
+
+ /*
+ * Bail if we're activating an old version, the author does not need to be
+ * notified about that.
+ */
+ if ( 'old' == $old_status ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $ticket_id = wporg_themes_get_version_meta( $post_id, '_ticket_id', $version );
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = $content = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,10 +372,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= 'https://make.wordpress.org/themes';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( get_user_by( 'id', $post->post_author )->user_email, $subject, $content, 'From: themes@wordpress.org' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- wporg_themes_update_wpthemescom( $post->post_name, $version );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wporg_themes_update_version_live', 'wporg_themes_approve_version', 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wporg_themes_update_version_live', 'wporg_themes_approve_version', 10, 3 );
</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"> * Closes a theme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,6 +401,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_themes_update_version_old', 'wporg_themes_close_version', 10, 2 );
</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">+ * Rolls back a live theme version.
+ *
+ * If the rolledback version was live, it finds the previous live version and
+ * sets it live again.
+ *
+ * @param int $post_id
+ * @param string $version
+ * @param string $old_status
+ */
+function wporg_themes_rollback_version( $post_id, $current_version, $old_status ) {
+ // If the version wasn't live, there's nothing for us to do.
+ if ( 'live' != $old_status ) {
+ return;
+ }
+
+ if ( ! class_exists( 'Trac' ) ) {
+ require_once ABSPATH . WPINC . '/class-IXR.php';
+ require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+ require_once WPORGPATH . 'bb-theme/themes/lib/class-trac.php';
+ }
+
+ // Check for tickets that were set to live previously.
+ $trac = new Trac( 'themetracbot', THEME_TRACBOT_PASSWORD, 'https://themes.trac.wordpress.org/login/xmlrpc' );
+ $tickets = (array) $trac->ticket_query( add_query_arg( array(
+ 'status' => 'closed',
+ 'resolution' => 'live',
+ 'keywords' => '~theme-' . get_post( $post_id )->post_name,
+ 'order' => 'changetime',
+ 'desc' => 1,
+ ) ) );
+ $ticket = next( $tickets );
+
+ // Bail if there is no prior live versions.
+ if ( ! $ticket ) {
+ return;
+ }
+
+ // Find the version number associated with the approved ticket.
+ $ticket_ids = get_post_meta( $post_id, '_ticket_id', true );
+ $prev_version = array_search( $ticket, $ticket_ids );
+
+ wporg_themes_update_version_status( $post_id, $prev_version, 'live' );
+}
+add_action( 'wporg_themes_update_version_new', 'wporg_themes_rollback_version', 10, 3 );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Updates wp-themes.com with the latest version of a theme.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_slug
</span></span></pre>
</div>
</div>
</body>
</html>