Changeset 11243

Timestamp:

09/17/2021 04:01:02 AM (3 years ago)

Author:

dd32

Message:

Theme Directory: Rejig the query modifications for when to include delisted themes.

This reimplements [11239] after it caused the API to fail to return correctly for non-delisted themes.

See #5906.

Location:

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

Files:

• class-themes-api.php (modified) (1 diff)
• query-modifications.php (modified) (3 diffs)

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

@@ -477 +477 @@
             // get_post_by_slug()
             $themes = get_posts( array(
-                'name'      => $this->request->slug,
-                'post_type' => 'repopackage',
-                'post_status' => 'publish,delist',
+                'name'        => $this->request->slug,
+                'post_type'   => 'repopackage',
+                'post_status' => 'publish', // delist will be added by query-modifications.
             ) );
 

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