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

Timestamp:

02/03/2015 07:18:37 PM (12 years ago)

Author:

obenland

Message:

WP.org Themes: Bail early if we're not looking for repopackages.

Once we have all themes synced over, this needs to be improved to work properly
with the various routes. Needed for Google parsing and parity between server
and API output.

See r1211, #745.

File:

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

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

@@ -61 +61 @@
  */
 function wporg_themes_set_up_query( $query ) {
-        if ( ! is_admin() && ! in_array( $query->query_vars['pagename'], array( 'upload', 'commercial' ) ) ) {
-
-                $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'];
+        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];
                 }
-                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 );
-        }
+        }
+        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;