Changeset 16705

Timestamp:

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

Author:

nacin

Message:

Post format indexes. First pass. see #15378.

Location:

trunk

Files:

• wp-admin/themes.php (modified) (3 diffs)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (6 diffs)

trunk/wp-admin/themes.php

@@ -13 +13 @@
 $wp_list_table->check_permissions();
 
-if ( current_user_can('switch_themes') && isset($_GET['action']) ) {
+if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
     if ( 'activate' == $_GET['action'] ) {
         check_admin_referer('switch-theme_' . $_GET['template']);
@@ -19 +19 @@
         wp_redirect( admin_url('themes.php?activated=true') );
         exit;
-    } else if ( 'delete' == $_GET['action'] ) {
+    } elseif ( 'delete' == $_GET['action'] ) {
         check_admin_referer('delete-theme_' . $_GET['template']);
         if ( !current_user_can('delete_themes') )
@@ -35 +35 @@
 
 if ( current_user_can( 'switch_themes' ) ) :
+
+// Flush rewrite rules on activation once new theme is in place.
+if ( isset( $_GET['activated'] ) && $_GET['activated'] == 'true' )
+    flush_rewrite_rules();
 
 $help = '<p>' . __('Aside from the default theme included with your WordPress installation, themes are designed and developed by third parties.') . '</p>';

trunk/wp-includes/post.php

@@ -5068 +5068 @@
 }
 
+function get_post_format_slugs() {
+    $slugs = array(
+        'default' => _x( 'default', 'Post format slug' ),
+        'aside'   => _x( 'aside',   'Post format slug' ),
+        'chat'    => _x( 'chat',    'Post format slug' ),
+        'gallery' => _x( 'gallery', 'Post format slug' ),
+        'link'    => _x( 'link',    'Post format slug' ),
+        'image'   => _x( 'image',   'Post format slug' ),
+        'quote'   => _x( 'quote',   'Post format slug' ),
+        'status'  => _x( 'status',  'Post format slug' ),
+        'video'   => _x( 'video',   'Post format slug' ),
+        'audio'   => _x( 'audio',   'Post format slug' ),
+    );
+    $slugs = array_map( 'sanitize_title_with_dashes', $slugs );
+    return $slugs;
+}
+
 /**
  * Returns a pretty, translated version of a post format slug
@@ -5106 +5123 @@
 }
 
+/**
+ * Returns a link to a post format index.
+ *
+ * @since 3.1.0
+ *
+ * @param $format string Post format
+ * @return string Link
+ */
+function get_post_format_link( $format ) {
+    $term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
+    if ( ! $term || is_wp_error( $term ) )
+        return false;
+    return get_term_link( $term );
+}
+
+/**
+ * Filters the request to allow for the format prefix.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_request( $qvs ) {
+    if ( ! isset( $qvs['post_format'] ) )
+        return $qvs;
+    $slugs = array_flip( get_post_format_slugs() );
+    if ( isset( $slugs[ $qvs['post_format'] ] ) )
+        $qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+    return $qvs;
+}
+add_filter( 'request', '_post_format_request' );
+
+/**
+ * Filters the post format term link to remove the format prefix.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_link( $link, $term, $taxonomy ) {
+    global $wp_rewrite;
+    if ( 'post_format' != $taxonomy )
+        return $link;
+    $slugs = get_post_format_slugs();
+    if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
+        return str_replace( "/{$term->slug}", '/' . $slugs[ str_replace( 'post-format-', '', $term->slug ) ], $link );
+    } else {
+        $link = remove_query_arg( 'format', $link );
+        return add_query_arg( 'format', str_replace( 'post-format-', $term->slug ), $link );
+    }
+}
+add_filter( 'term_link', '_post_format_link', 10, 3 );
+
 ?>

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),