Changeset 1118 for sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

Timestamp:

01/09/2015 04:40:51 PM (10 years ago)

Author:

obenland

Message:

Theme Directory: Fix a bug where exisiting ticket couldn't be found.

We were looking in the wrong post meta bucket for a ticket ID.

This also removes a redundant update for the latest version's status,
and since this can now be considered a working Trac connection, enables the
fail safe in case anything goes wrong with Trac interactions.

See #745.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -218 +218 @@
         $ticket_id = $this->create_or_update_trac_ticket();
 
-        // Temporarily disabled, until we hava a working Trac connection.
-        if ( false /* ! $ticket_id */ ) {
+        if ( ! $ticket_id  ) {
             $this->remove_files( $this->tmp_dir );
 
@@ -501 +500 @@
         // If there's a previous version, and the most current version's status is either `new` or `pending`, we update.
         if ( ! empty( $this->theme_post->max_version ) && in_array( $this->theme_post->_status[ $this->theme_post->max_version ], array( 'new', 'pending' ) ) ) {
-            $ticket_id = (int) $this->theme_post->_tickets[ $this->theme_post->max_version ];
+            $ticket_id = (int) $this->theme_post->_ticket_id[ $this->theme_post->max_version ];
             $ticket    = $this->trac->ticket_get( $ticket_id );
 
             // Make sure the ticket has no resolution and is not approved (3 = ticket attributes).
             if ( empty( $ticket[3]['resolution'] ) && 'approved' !== $ticket[3]['status'] ) {
-                $this->theme_post->_status[ $this->theme_post->max_version ] = 'old';
-                update_post_meta( $this->theme_post->ID, '_status', $this->theme_post->_status );
-
                 $result    = $this->trac->ticket_update( $ticket_id, $this->trac_ticket->description, array( 'summary' => $this->trac_ticket->summary ), true /* Trigger email notifications */ );
                 $ticket_id = $result ? $ticket_id : false;