Changeset 15732

Timestamp:

10/06/2010 11:04:03 AM (14 years ago)

Author:

scribu

Message:

Make hierarchical URLs work for any hierarchical taxonomy. See #12659

Location:

trunk/wp-includes

Files:

• query.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -1487 +1487 @@
         $tax_query = array();
 
-        if ( $this->is_tax ) {
-            foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-                if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
-                    $tax_query_defaults = array(
-                        'taxonomy' => $taxonomy,
-                        'field' => 'slug',
-                        'operator' => 'IN'
-                    );
-
-                    $term = str_replace( ' ', '+', $q[$t->query_var] );
-
-                    if ( strpos($term, '+') !== false ) {
-                        $terms = preg_split( '/[+\s]+/', $term );
-                        foreach ( $terms as $term ) {
-                            $tax_query[] = array_merge( $tax_query_defaults, array(
-                                'terms' => array( $term )
-                            ) );
-                        }
-                    } else {
+        foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+            if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+                $tax_query_defaults = array(
+                    'taxonomy' => $taxonomy,
+                    'field' => 'slug',
+                    'operator' => 'IN'
+                );
+
+                $term = urlencode( urldecode( $q[$t->query_var] ) );
+
+                if ( $t->hierarchical_url ) {
+                    $tax_query[] = array_merge( $tax_query_defaults, array(
+                        'terms' => array( basename( str_replace( '%2F', '/', $term ) ) )
+                    ) );
+                } elseif ( strpos($term, '+') !== false ) {
+                    $terms = preg_split( '/[+\s]+/', $term );
+                    foreach ( $terms as $term ) {
                         $tax_query[] = array_merge( $tax_query_defaults, array(
-                            'terms' => preg_split('/[,\s]+/', $term)
+                            'terms' => array( $term )
                         ) );
                     }
+                } else {
+                    $tax_query[] = array_merge( $tax_query_defaults, array(
+                        'terms' => preg_split('/[,\s]+/', $term)
+                    ) );
                 }
             }
@@ -1550 +1552 @@
                 'operator' => 'NOT IN',
                 'field' => 'term_id'
-            );
-        }
-
-        // Category stuff for nice URLs
-        if ( '' != $q['category_name'] && !$this->is_singular ) {
-            $q['category_name'] = str_replace( '%2F', '/', urlencode(urldecode($q['category_name'])) );
-            $q['category_name'] = '/' . trim( $q['category_name'], '/' );
-
-            $tax_query[] = array(
-                'taxonomy' => 'category',
-                'terms' => array( basename( $q['category_name'] ) ),
-                'operator' => 'IN',
-                'field' => 'slug'
             );
         }

trunk/wp-includes/taxonomy.php

@@ -18 +18 @@
     register_taxonomy( 'category', 'post', array(
         'hierarchical' => true,
+        'hierarchical_url' => true,
         'update_count_callback' => '_update_post_term_count',
-        'query_var' => false,
+        'query_var' => 'category_name',
         'rewrite' => false,
         'public' => true,