Ticket #16149: 16149.diff

wp-includes/post.php

@@ -534 +534 @@
                         $format = 'post-format-' . $format;
         }
 
+        if ( ! term_exists( 'post-format-standard', 'post_format' ) )
+                wp_insert_term( 'post-format-standard', 'post_format' );
+
         return wp_set_post_terms($post->ID, $format, 'post_format');
 }
 
@@ -5144 +5147 @@
 }
 
 /**
- * Filters the request to allow for the format prefix.
+ * Filters the request to allow for the format prefix and handles the standard post format query.
  *
  * @access private
  * @since 3.1.0
@@ -5152 +5155 @@
 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'] ];
+        $by_raw_slug = get_post_format_slugs();
+        $by_translated_slug = array_flip( $by_raw_slug );
+        if ( isset( $by_translated_slug[ $qvs['post_format'] ] ) ) {
+                if ( 'standard' == $by_translated_slug[ $qvs['post_format'] ] ) {
+                        // If 'standard', then query every persistent format with a NOT IN instead.
+                        unset( $qvs['post_format'] );
+                        $formats = array();
+                        $raw_slugs = array_diff( array_keys( $by_raw_slug ), array( 'standard' ) );
+                        foreach ( $raw_slugs as $format ) {
+                                        $formats[] = 'post-format-' . $format;
+                        }
+                        if ( ! isset( $qvs['tax_query'] ) )
+                                $qvs['tax_query'] = array();
+                        $qvs['tax_query'][] = array( 'taxonomy' => 'post_format', 'terms' => $formats, 'field' => 'slug', 'operator' => 'NOT IN' );
+                        $qvs['tax_query']['relation'] = 'AND';
+                        // Repair the query flags and queried object.
+                        add_action( 'parse_query', '_post_format_parse_query' );
+                } else {
+                        $qvs['post_format'] = 'post-format-' . $by_translated_slug[ $qvs['post_format'] ];
+                }
+        }
+        // Only post types that support formats should be queried.
+        // Especially important for the NOT IN 'standard' format query.
+        $tax = get_taxonomy( 'post_format' );
+        $qvs['post_type'] = $tax->object_type;
         return $qvs;
 }
 add_filter( 'request', '_post_format_request' );
 
 /**
+ * Filters the query object when the standard post format is requested.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _post_format_parse_query( $query ) {
+        $query->is_tax = $query->is_archive = true;
+        $query->is_home = false;
+        $query->queried_object = get_term_by( 'slug', 'post-format-standard', 'post_format' ); 
+        $query->queried_object_id = $query->queried_object->term_id;
+}
+
+/**
  * Filters the post format term link to remove the format prefix.
  *
  * @access private