Changeset 11240

Timestamp:

09/15/2021 11:07:04 AM (5 years ago)

Author:

stankea

Message:

Revert r11239 - seems to be breaking the theme_information endpoint https://meta.trac.wordpress.org/ticket/5906

File:

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

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

@@ -13 +13 @@
                 return;
         }
-
         // Themes are never via pagename
         if ( !empty( $query->query_vars['pagename'] ) ) {
@@ -24 +23 @@
         }
 
-        // From now on, always query published themes.
-        $query->query_vars['post_type']   = 'repopackage';
-        if ( ! isset( $query->query_vars['post_status'] ) ) {
-                $query->query_vars['post_status'] = 'publish';
-        }
+        // From now on, always query themes.
+        $query->query_vars['post_type'] = 'repopackage';
         if ( ! isset( $query->query_vars['browse'] ) ) {
                 $query->query_vars['browse'] = '';
@@ -38 +34 @@
         }
 
-        // Delisted items should be available on singular / author archives.
+        // eliminate draft posts from showing up in the directory
         if (
-                ! empty( $query->query_vars['name'] ) ||
-                ! empty( $query->query_vars['author_name'] )
+                (
+                        ! isset( $query->query_vars['post_status'] ) ||
+                        'publish' === $query->query_vars['post_status']
+                ) &&
+                ! $query->is_search()
         ) {
-                if ( ! is_array( $query->query_vars['post_status'] ) ) {
-                        $query->query_vars['post_status'] = array(
-                                $query->query_vars['post_status']
-                        );
-                }
-
-                $query->query_vars['post_status'][] = 'delist';
-        }
+                $query->query_vars['post_status'] = array(
+                        'publish',
+                        'delist',
+                );
+        } 
 
         switch ( $query->query_vars['browse'] ) {