Changeset 15803 for trunk/wp-includes/query.php

Timestamp:

10/14/2010 10:39:47 AM (11 years ago)

Author:

nacin

Message:

Custom post type archives. see #13818.

File:

• trunk/wp-includes/query.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -103 +103 @@
  * 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.
+ *
  * @see WP_Query::is_archive()
  * @since 1.5.0
  * @uses $wp_query
  *
+ * @param mixed $post_types Optional. Post type or array of post types
  * @return bool
  */
-function is_archive() {
-    global $wp_query;
-
-    return $wp_query->is_archive();
+function is_archive( $post_types = '' ) {
+    global $wp_query;
+
+    return $wp_query->is_archive( $post_types );
 }
 
@@ -1298 +1304 @@
             }
 
-            if ( '' != $qv['author_name'] ) {
+            if ( '' != $qv['author_name'] )
                 $this->is_author = true;
-            }
-
-            if ( ($this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax) )
+
+            if ( !empty( $qv['post_type'] ) )
+                $this->is_archive = true;
+
+            if ( $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
                 $this->is_archive = true;
         }
@@ -2606 +2614 @@
      * 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.
+     *
      * @since 3.1.0
      *
+     * @param mixed $post_types Optional. Post type or array of post types
      * @return bool
      */
-    function is_archive() {
-        return (bool) $this->is_archive;
+    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 );
     }
 
@@ -3003 +3025 @@
     function is_singular( $post_types = '' ) {
         if ( empty( $post_types ) || !$this->is_singular )
-            return $this->is_singular;
+            return (bool) $this->is_singular;
 
         $post_obj = $this->get_queried_object();