Changeset 1382

Timestamp:

03/06/2015 02:22:56 AM (10 years ago)

Author:

obenland

Message:

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 #926.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php

@@ -276 +276 @@
  */
 function wporg_themes_update_version_status( $post_id, $current_version, $new_status ) {
-    $meta = get_post_meta( $post_id, '_status', true );
+    $meta       = get_post_meta( $post_id, '_status', true );
+    $old_status = $meta[ $current_version ];
+
+    // Don't do anything when the status hasn't changed.
+    if ( $new_status == $old_status ) {
+        return;
+    }
 
     switch ( $new_status ) {
@@ -303 +309 @@
      * @param string $current_version The theme version that was updated.
      * @param string $new_status      The new status for that theme version.
+     * @param string $old_status      The old status for that theme version.
      */
-    do_action( 'wporg_themes_update_version_status', $post_id, $current_version, $new_status );
+    do_action( 'wporg_themes_update_version_status', $post_id, $current_version, $new_status, $old_status );
 
     /**
@@ -312 +319 @@
      * @param int    $post_id         Post ID.
      * @param string $current_version The theme version that was updated.
+     * @param string $old_status      The old status for that theme version.
      */
-    do_action( "wporg_themes_update_version_{$new_status}", $post_id, $current_version );
+    do_action( "wporg_themes_update_version_{$new_status}", $post_id, $current_version, $old_status );
 
     return update_post_meta( $post_id, '_status', $meta );
@@ -325 +333 @@
  * @param int    $post_id
  * @param string $version
- */
-function wporg_themes_approve_version( $post_id, $version ) {
-    $post      = get_post( $post_id );
+ * @param string $old_status
+ */
+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;
+    }
+
     $ticket_id = wporg_themes_get_version_meta( $post_id, '_ticket_id', $version );
     $subject = $content = '';
@@ -353 +373 @@
 
     wp_mail( get_user_by( 'id', $post->post_author )->user_email, $subject, $content, 'From: themes@wordpress.org' );
-
-    wporg_themes_update_wpthemescom( $post->post_name, $version );
-}
-add_action( 'wporg_themes_update_version_live', 'wporg_themes_approve_version', 10, 2 );
+}
+add_action( 'wporg_themes_update_version_live', 'wporg_themes_approve_version', 10, 3 );
 
 /**
@@ -382 +400 @@
 }
 add_action( 'wporg_themes_update_version_old', 'wporg_themes_close_version', 10, 2 );
+
+/**
+ * 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 );
 
 /**