Changeset 14966

Timestamp:

07/13/2026 08:07:13 PM (2 weeks ago)

Author:

obenland

Message:

Theme Directory: Guard against repopackage posts missing _status meta

Closes ​https://github.com/WordPress/wordpress.org/pull/705.

Location:

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

Files:

• class-themes-api.php (modified) (1 diff)
• class-wporg-themes-upload.php (modified) (5 diffs)
• phpunit.xml (added)
• tests (added)
• tests/Missing_Status_Meta_Test.php (added)
• tests/bootstrap.php (added)

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

@@ -867 +867 @@
                         $phil->versions = array();
 
-                        foreach ( array_keys( get_post_meta( $theme->ID, '_status', true ) ) as $version ) {
+                        $status   = get_post_meta( $theme->ID, '_status', true );
+                        $versions = is_array( $status ) ? array_keys( $status ) : array();
+                        foreach ( $versions as $version ) {
                                 $phil->versions[ $version ] = $repo_package->download_url( $version );
                         }

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

@@ -788 +788 @@
 
                                 if ( $is_new_upload && $this->theme_post ) {
-                                        wp_delete_post( $this->theme_post->ID, true );
+                                        $this->delete_theme_post();
                                 }
 
@@ -1316 +1316 @@
                  */
                 if ( in_array( $prev_status, [ 'new', 'approved' ], true ) ) {
-                        $ticket_id = (int) $this->theme_post->_ticket_id[ $this->theme_post->max_version ];
+                        $ticket_id = (int) ( $this->theme_post->_ticket_id[ $this->theme_post->max_version ] ?? 0 );
                         $ticket    = $this->trac->ticket_get( $ticket_id );
 
@@ -1448 +1448 @@
                         $this->update_versioned_meta( $meta_key, $meta_value );
                 }
+        }
+
+        /**
+         * Deletes the theme post.
+         *
+         * Used to clean up a freshly created post when a new upload fails.
+         * Temporarily detaches the fail-safe that prevents repopackages from
+         * being deleted, which would otherwise wp_die() before the post is
+         * removed, leaving an orphaned post without versioned meta behind.
+         *
+         * @return WP_Post|false|null Post data on success, false or null on failure.
+         */
+        public function delete_theme_post() {
+                remove_filter( 'before_delete_post', 'wporg_theme_no_delete_repopackage' );
+                $result = wp_delete_post( $this->theme_post->ID, true );
+                add_filter( 'before_delete_post', 'wporg_theme_no_delete_repopackage' );
+
+                return $result;
         }
 
@@ -1753 +1771 @@
          */
         public function populate_post_with_meta( $theme ) {
-                foreach ( get_post_custom_keys( $theme->ID ) as $meta_key ) {
+                foreach ( (array) get_post_custom_keys( $theme->ID ) as $meta_key ) {
                         $theme->$meta_key = get_post_meta( $theme->ID, $meta_key, true );
 
@@ -1762 +1780 @@
 
                 // Save the highest recorded version number.
-                $uploaded_versions  = array_keys( $theme->_status );
+                $uploaded_versions  = is_array( $theme->_status ) ? array_keys( $theme->_status ) : array();
                 $theme->max_version = end( $uploaded_versions );