Changeset 9086

Timestamp:

07/30/2019 09:11:33 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: When a theme update older than two years is uploaded, do not auto-approve the Trac ticket.

Previously the Theme Directory was incorrectly applying the 2 year cutoff to the query that the Trac Sync uses, seemingly by accident as as it was coded all updates should've been auto-approved.

Now theme updates older than two years will not have their Trac ticket auto-closed as live, and theme reviewers can review the open theme update tickets, mark as live on Trac, and have the Trac sync mark the version as live in WordPress.

See #4634.

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (1 diff)
• jobs/class-trac-sync.php (modified) (1 diff)
• query-modifications.php (modified) (2 diffs)

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

@@ -774 +774 @@
             ) );
 
-            // Theme review team auto-approves theme-updates, so mark the theme as live immediately, without sending additional email
+            $theme_is_older_than_two_years = strtotime( $this->theme_post->post_modified ) < strtotime( '-2 years' );
+
+            // Theme review team auto-approves theme-updates, so mark the theme as live immediately, if last updated within two years.
             // Note that this only applies to new ticket creation, so it won't happen on themes with existing outstanding tickets
-            if ( $this->trac_ticket->priority == 'theme update' ) {
+            if ( ! $theme_is_older_than_two_years && $this->trac_ticket->priority == 'theme update' ) {
                 $this->trac->ticket_update( $ticket_id, 'Theme Update for existing Live theme - automatically reviewed', array( 'action' => 'review' ), false );
                 $this->trac->ticket_update( $ticket_id, 'Theme Update for existing Live theme - automatically approved', array( 'action' => 'approve_and_live' ), false );

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/jobs/class-trac-sync.php

@@ -114 +114 @@
             'posts_per_page' => - 1,
             'meta_query'     => [
-                [
+                'trac_sync_ticket_id' => [
                     'value'   => $ticket_id,
                     'compare' => 'IN',

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

@@ -108 +108 @@
     }
 
-    // Unless a specific theme, or author is being requested, limit results to the last 2 years.
-    if ( empty( $query->query_vars['name'] ) && empty( $query->query_vars['author_name'] ) && ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) ) ) {
+    // Unless a specific theme/author is being requested, or it's an internal query, limit results to the last 2 years.
+    if (
+        empty( $query->query_vars['name'] ) &&
+        empty( $query->query_vars['author_name'] ) &&
+        ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) ) &&
+        empty( $query->query_vars['meta_query']['trac_sync_ticket_id'] ) // jobs/class-trac-sync.php - Always needs to find the post, and looks up via a meta search.
+    ) {
         $query->query_vars['date_query']['recent_themes_only'] = array(
             'column' => 'post_modified',
@@ -117 +122 @@
 
     // Prioritize translated themes for localized requests, except when viewing a specific ordered themes.
-    if ( 'en_US' !== get_locale() && ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) )  ) {
+    if (
+        'en_US' !== get_locale() &&
+        ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) )
+    ) {
         add_filter( 'posts_clauses', 'wporg_themes_prioritize_translated_posts_clauses' );
     }