Changeset 1274 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

Timestamp:

02/17/2015 11:18:19 PM (10 years ago)

Author:

obenland

Message:

WP.org Themes: Use main query instead of Themes API for server output.

• Can now deal properly with /browse/*/ URL structure.
• Adds single theme navigation.
• Adds Photon support for server output.
• Brings single theme view closer to melchoyce's mockups.

See #745.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

@@ -55 +55 @@
 
 /**
- * Makes an API request to retrieve the right themes for the current query.
- *
- * @param WP_Query $query
- * @return WP_Query
- */
-function wporg_themes_set_up_query( $query ) {
-    if ( is_admin() || in_array( $query->query_vars['pagename'], array( 'upload', 'commercial' ) ) || 'nav_menu_item' == $query->get( 'post_type' ) ) {
-        return $query;
-    }
-
-    $query->set( 'post_type', 'repopackage' );
-
-    $args = array(
-        'per_page' => 15,
-        'fields'   => array(
-            'description'  => true,
-            'sections'     => false,
-            'tested'       => true,
-            'requires'     => true,
-            'rating'       => true,
-            'downloaded'   => true,
-            'downloadlink' => true,
-            'last_updated' => true,
-            'homepage'     => true,
-            'tags'         => true,
-            'num_ratings'  => true,
-            'parent'       => true,
-        ),
-    );
-
-    if ( $query->query_vars['tag'] ) {
-        $args['tag'][] = $query->query_vars['tag'];
-    }
-    elseif ( $query->query_vars['author_name'] ) {
-        $args['author'] = $query->query_vars['author_name'];
-    }
-    elseif ( $query->query_vars['pagename'] ) {
-        $slugs = explode( '/', $query->query_vars['pagename'] );
-
-        if ( count( $slugs ) > 1 && 'browse' == $slugs[0] ) {
-            $args['browse'] = $slugs[1];
-        } else {
-            $args['theme'] = $slugs[0];
-        }
-    }
-    else {
-        $args['browse'] = 'featured';
-    }
-
-    if ( ! function_exists( 'themes_api' ) ) {
-        include ABSPATH . 'wp-admin/includes/theme.php';
-    }
-    $GLOBALS['themes'] = themes_api( 'query_themes', $args );
-
-    return $query;
-}
-add_filter( 'pre_get_posts', 'wporg_themes_set_up_query' );
-
-/**
  * Enqueue scripts and styles.
  */
@@ -123 +64 @@
     wp_enqueue_style( 'wporg-themes-style', get_stylesheet_uri() );
 
-    wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array(), null );
+    wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array( 'jquery' ), null );
 
     if ( ! is_singular( 'page' ) ) {
@@ -199 +140 @@
  */
 function wporg_themes_api_args( $args, $action ) {
-    if ( 'query_themes' == $action ) {
+    if ( in_array( $action, array( 'query_themes', 'theme_information' ) ) ) {
         $args->per_page = 30;
         $args->fields['parent']  = true;