Changeset 15937

Timestamp:

10/23/2010 07:20:47 PM (14 years ago)

Author:

nacin

Message:

Remove post_type params from is_archive(). use is_post_type_archive() for full context. see #13818.

Location:

trunk/wp-includes

Files:

• post.php (modified) (1 diff)
• query.php (modified) (3 diffs)

trunk/wp-includes/post.php

@@ -860 +860 @@
  *     types and page labels for hierarchical ones. You can see accepted values in {@link get_post_type_labels()}.
  * - permalink_epmask - The default rewrite endpoint bitmasks.
- * - has_archive - Whether to have a post type archive. Will generate the proper rewrite rules if rewrite is enabled.
+ * - has_archive - True to enable post type archives. Will generate the proper rewrite rules if rewrite is enabled.
  * - rewrite - false to prevent rewrite. Defaults to true. Use array('slug'=>$slug) to customize permastruct;
  *     default will use $post_type as slug. Other options include 'with_front' and 'feeds'.

trunk/wp-includes/query.php

@@ -101 +101 @@
  * Is the query for an archive page?
  *
- * Month, Year, Category, Author, ...
- *
- * If the $post_types parameter is specified, this function will additionally
- * check if the query is for exactly one of the post types specified. If a plugin
- * is causing multiple post types to appear in the query, specifying a post type
- * will cause this check to return false.
+ * Month, Year, Category, Author, Post Type archive...
  *
  * @see WP_Query::is_archive()
@@ -112 +107 @@
  * @uses $wp_query
  *
- * @param mixed $post_types Optional. Post type or array of post types
  * @return bool
  */
@@ -2645 +2639 @@
      * Is the query for an archive page?
      *
-     * Month, Year, Category, Author, ...
-     *
-     * If the $post_types parameter is specified, this function will additionally
-     * check if the query is for exactly one of the post types specified. If a plugin
-     * is causing multiple post types to appear in the query, specifying a post type
-     * will cause this check to return false.
+     * Month, Year, Category, Author, Post Type archive...
      *
      * @since 3.1.0
      *
-     * @param mixed $post_types Optional. Post type or array of post types
      * @return bool
      */
     function is_archive( $post_types ) {
-        if ( empty( $post_types ) || !$this->is_archive )
-            return (bool) $this->is_archive;
-
-        if ( ! isset( $this->posts[0] ) )
-            return false;
-
-        $post = $this->posts[0];
-
-        return in_array( $post->post_type, (array) $post_types );
+        return (bool) $this->is_archive;
     }