Changeset 2680

Timestamp:

03/03/2016 07:04:56 PM (10 years ago)

Author:

Otto42

Message:

Simplify oembed logic now that is correctly populated. Fix the post_type variable for theme queries

File:

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

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

@@ -905 +905 @@
 
 /**
- * Fix the query to allow embeds to work on single theme pages
- */
-function wporg_themes_embed_handler() {
-    global $wp_query;
-
-    $themes = wporg_themes_get_themes_for_query();
-    if ( $themes['total'] == 1 ) {
-        $wp_query = new WP_Query( array(
-            'name' => get_query_var('name'),
-            'post_type' => 'repopackage',
-        ));
-        wp_reset_postdata();
-    }
-}
-add_action( 'embed_head', 'wporg_themes_embed_handler' );
-add_action( 'wp_head', 'wporg_themes_embed_handler', 1 );
-
-/**
- * Fix the singular check to allow embed info to be added to head for single theme pages
- */
-function wporg_themes_singular_fix() {
-    global $wp_query;
+ * Correct the post type for theme queries to be "repopackage"
+ */
+function wporg_themes_adjust_main_query( $query ) {
     if ( get_query_var('name') && !is_404() ) {
-        $wp_query->is_singular = true;
-    }
-}
-add_action( 'template_redirect', 'wporg_themes_singular_fix', 20 );
+        $query->query_vars['post_type'] = 'repopackage';
+    }
+}
+add_action( 'pre_get_posts', 'wporg_themes_adjust_main_query');
 
 /**