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

Timestamp:

02/25/2015 04:59:25 AM (12 years ago)

Author:

dd32

Message:

Themes Directory: Simplify the Rewwrite rules, the previous ones were duplicated and created extra unused rules.

File:

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

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

@@ -60 +60 @@
                 'query_var'           => true,
                 'can_export'          => true,
-                'rewrite'             => array( 'slug' => '/' ),
+                'rewrite'             => false,
                 'capability_type'     => 'post',
         );
@@ -69 +69 @@
         }
 
+        // Add the browse/* views
         add_rewrite_tag( '%browse%', '(featured|popular|new)' );
-
-        // Single themes.
-        add_rewrite_rule( '(.?.+?)(/[0-9]+)?/?$', 'index.php?post_type=repopackage&name=$matches[1]', 'top' );
-
-        // Browse views.
-        add_rewrite_rule( 'browse/(featured|popular|new)/?$', 'index.php?post_type=repopackage&browse=$matches[1]', 'top' );
-
-        // Paginated browse views.
-        add_rewrite_rule( 'browse/(featured|popular|new)/page/?([0-9]{1,})/?$', 'index.php?post_type=repopackage&browse=$matches[1]&paged=$matches[2]', 'top' );
+        add_permastruct( 'browse', 'browse/%browse%' );
+
 }
 add_action( 'init', 'wporg_themes_init' );
@@ -95 +89 @@
         $wp_query->set( 'post_type', 'repopackage' );
 
-        if ( $wp_query->is_home() ) {
+        if ( $wp_query->is_home() && ! $wp_query->get( 'browse' ) ) {
                 $wp_query->set( 'browse', 'featured' );
         }
@@ -104 +98 @@
                                 $wp_query->set( 'paged', 1 );
                                 $wp_query->set( 'posts_per_page', 15 );
-                                $wp_query->set( 'post__in', (array) wp_cache_get( 'browse-popular', 'theme-info' ) );
+                                $wp_query->set( 'post__in', (array) wp_cache_get( 'browse-featured', 'theme-info' ) );
                                 break;