Changeset 16705 for trunk/wp-includes/taxonomy.php

Timestamp:

12/03/2010 10:13:17 AM (10 years ago)

Author:

nacin

Message:

Post format indexes. First pass. see #15378.

File:

• trunk/wp-includes/taxonomy.php (modified) (6 diffs)

trunk/wp-includes/taxonomy.php

@@ -20 +20 @@
         'update_count_callback' => '_update_post_term_count',
         'query_var' => 'category_name',
-        'rewrite' => array(
+        'rewrite' => did_action( 'init' ) ? array(
                     'hierarchical' => true,
                     'slug' => get_option('category_base') ? get_option('category_base') : 'category',
-                    'with_front' => false),
+                    'with_front' => false) : false,
         'public' => true,
         'show_ui' => true,
@@ -33 +33 @@
         'update_count_callback' => '_update_post_term_count',
         'query_var' => 'tag',
-        'rewrite' => array(
-                    'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag' ,
-                    'with_front' => false),
+        'rewrite' => did_action( 'init' ) ? array(
+                    'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
+                    'with_front' => false) : false,
         'public' => true,
         'show_ui' => true,
@@ -53 +53 @@
         '_builtin' => true,
         'show_in_nav_menus' => false,
-    ) ) ;
+    ) );
 
     register_taxonomy( 'link_category', 'link', array(
@@ -76 +76 @@
         'show_ui' => false,
         '_builtin' => true,
-    ) ) ;
+    ) );
+
+    $rewrite = false;
+    if ( did_action( 'init' ) && current_theme_supports( 'post-formats' ) ) {
+        $rewrite = apply_filters( 'post_format_rewrite_base', 'type' );
+        $rewrite = $rewrite ? array( 'slug' => $rewrite ) : false;
+    }
 
     register_taxonomy( 'post_format', 'post', array(
-        'public' => false,
+        'public' => true,
         'hierarchical' => false,
         'labels' => array(
@@ -85 +91 @@
             'singular_name' => '',
         ),
-        'query_var' => false,
-        'rewrite' => false,
+        'query_var' => 'post_format',
+        'rewrite' => $rewrite,
         'show_ui' => false,
         '_builtin' => true,
         'show_in_nav_menus' => false,
-    ) ) ;
+    ) );
 }
 add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
@@ -311 +317 @@
     }
 
-    if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') && !empty($wp_rewrite) ) {
+    if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
         $args['rewrite'] = wp_parse_args($args['rewrite'], array(
             'slug' => sanitize_title_with_dashes($taxonomy),