Changeset 12917

Timestamp:

09/25/2023 11:29:08 PM (18 months ago)

Author:

iandunn

Message:

Theme Directory: Return when published to prevent duplicate imports

wporg_themes_glotpress_mark_as_active_on_publish() was only intended to run when a suspended/delisted theme was reinstated, but it was also running when a new version of a published theme was uploaded. That caused wporg_themes_update_wpthemescom() to run a second time, after it was originally called by the import process. The second time it was called with the _previous_ version of the theme, though, because it ran before the _status value was updated in the database. That caused previews on wp-theme.com to always show the previous version instead of the current one.

Props iandunn, dufresnesteven, paulkevan
See #7213

File:

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

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

@@ -724 +724 @@
 
     $trace = wp_debug_backtrace_summary();
-    $message = __FUNCTION__ . " trace: " . $trace;
+    $message = __FUNCTION__ .  " - slug: $theme_slug - version: $theme_version - trace: $trace";
     slack_dm( $message, 'iandunn' );
 }
@@ -1151 +1151 @@
  * @param int  $post_id The post ID being published
  */
-function wporg_themes_glotpress_mark_as_active_on_publish( $post_id ) {
-    $post           = get_post( $post_id );
+function wporg_themes_glotpress_mark_as_active_on_publish( $post_id, $post, $old_status ) {
+    // This is only intended to handle when a suspended/delisted theme is reinstated. Other functions handle when
+    // a new version of a published theme is uploaded.
+    if ( 'publish' === $old_status ) {
+        return;
+    }
+
     $latest_version = array_search( 'live', $post->_status ?: [] );
+
     if ( ! $latest_version ) {
         return;
@@ -1159 +1165 @@
 
     wporg_themes_glotpress_import( $post, $latest_version );
+
     wporg_themes_update_wpthemescom( $post->post_name, $latest_version );
 }
-add_action( 'publish_repopackage', 'wporg_themes_glotpress_mark_as_active_on_publish', 100 );
+add_action( 'publish_repopackage', 'wporg_themes_glotpress_mark_as_active_on_publish', 10, 3 );
 
 /**