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

Timestamp:

03/17/2016 05:39:02 AM (9 years ago)

Author:

dd32

Message:

Themes Directory: Open-source the pre_get_posts logic used by the Themes Directory & add logic to handle the domain not matching the home_url.

This allows us to remove the 'placeholder' sites we use for the themes directory on internationalized sites (xx.wordpress.org/themes), and makes the query logic more transparent.

See #1630 (which this is the first part for)
See #1618 (Some work will still be needed to correctly trim the description)

File:

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

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

@@ -12 +12 @@
  */
 
-global $themes;
-
 get_header();
 ?>
@@ -19 +17 @@
         <div class="wp-filter">
             <div class="filter-count">
-                <span class="count theme-count"><?php echo number_format_i18n( $themes['total'] ); ?></span>
+                <span class="count theme-count"><?php echo number_format_i18n( $wp_query->found_posts ); ?></span>
             </div>
 
@@ -67 +65 @@
                 <?php
                 if ( get_query_var('name') && !is_404() ) {
-                    $theme = reset( $themes['themes'] );
-                    include __DIR__ . '/theme-single.php';
+                    while ( have_posts() ) {
+                        the_post();
+                        $theme = wporg_themes_theme_information( $post->post_name );
+                        include __DIR__ . '/theme-single.php';
+                    }
                 } else {
-                    foreach ( $themes['themes'] as $theme ) {
+                    while ( have_posts() ) {
+                        the_post();
+                        $theme = wporg_themes_theme_information( $post->post_name );
                         include __DIR__ . '/theme.php';
                     }
 
                     // Add the navigation between pages
-                    if ( $themes['pages'] > 1 ) {
-                        echo '<nav class="posts-navigation">';
-                        echo paginate_links( array(
-                            'total' => $themes['pages'],
-                            'mid_size' => 3,
-                        ) );
-                        echo '</nav>';
-                    }
+                    echo '<nav class="posts-navigation">';
+                    echo paginate_links( array(
+                        'mid_size' => 3,
+                    ) );
+                    echo '</nav>';
                 }
                 ?>
             </div>
 
+            <?php /* TODO: Don't display this for no-js queries where $wp_query->post_count > 0, but JS needs it too. */ ?>
             <p class="no-themes"><?php _e( 'No themes found. Try a different search.', 'wporg-themes' ); ?></p>
         </div>