Changeset 12845

Timestamp:

08/17/2023 04:10:57 AM (20 months ago)

Author:

dd32

Message:

Theme Directory: When a theme is published, mark the GlotPress project and wp-themes.com as available.

See #7213.

Location:

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

Files:

• admin-edit.php (modified) (3 diffs)
• theme-directory.php (modified) (2 diffs)

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

@@ -193 +193 @@
     }
     elseif ( current_user_can( 'reinstate_theme', $post->ID ) && 'suspend' == $post->post_status ) {
-        $links[] = sprintf( '<a class="submit-reinstate_theme" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Suspend this item', 'wporg-themes' ), esc_url( wporg_themes_get_reinstate_url( $post ) ), __( 'Reinstate', 'wporg-themes' ) );
+        $links[] = sprintf( '<a class="submit-reinstate_theme" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Reinstate this item', 'wporg-themes' ), esc_url( wporg_themes_get_reinstate_url( $post ) ), __( 'Reinstate', 'wporg-themes' ) );
     }
 
@@ -260 +260 @@
         'post_status' => 'suspend',
     ) );
-
-    wporg_themes_remove_wpthemescom( $post->post_name );
 
     wp_redirect( add_query_arg( 'suspended', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated', 'delisted', 'relisted' ), wp_get_referer() ) ) );
@@ -404 +402 @@
 }
 add_filter( 'admin_action_relist', 'wporg_themes_relist_theme' );
-
-/**
- * Remove themes from wp-themes.com upon theme status moving to draft.
- *
- * @param WP_Post $post
- */
-function wporg_themes_remove_draft_themes_from_wpthemescom( $post ) {
-    if ( 'repopackage' === $post->post_type ) {
-        wporg_themes_remove_wpthemescom( $post->post_name );
-    }
-}
-add_action( 'publish_to_draft', 'wporg_themes_remove_draft_themes_from_wpthemescom' );
 
 /**

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

@@ -1118 +1118 @@
 
 /**
- * Hooks into the Suspend process to mark a theme as inactive in GlotPress.
+ * Hooks into the Suspend/Draft process to mark a theme as inactive in GlotPress.
  *
  * @param int  $post_id The post ID being suspended
@@ -1129 +1129 @@
 
     wporg_themes_glotpress_import( $post, 'inactive' );
+    wporg_themes_remove_wpthemescom( $post->post_name );
 }
 add_action( 'suspend_repopackage', 'wporg_themes_glotpress_mark_as_inactive_on_suspend' );
+add_action( 'publish_to_draft', 'wporg_themes_glotpress_mark_as_inactive_on_suspend' );
+
+/**
+ * Hooks into the publish process to mark a theme as active in GlotPress if it was deactivated.
+ *
+ * @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 );
+    $latest_version = array_search( 'live', $post->_status ?: [] );
+    if ( ! $latest_version ) {
+        return;
+    }
+
+    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' );
 
 /**