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

Timestamp:

10/15/2010 07:44:57 PM (15 years ago)

Author:

nacin

Message:

Custom post type archives, second pass. see #13818.

File:

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

trunk/wp-includes/query.php

@@ -122 +122 @@
 
 /**
+ * Is the query for a post type archive page?
+ *
+ * @see WP_Query::is_post_type_archive()
+ * @since 3.1.0
+ * @uses $wp_query
+ *
+ * @param mixed $post_types Optional. Post type or array of posts types to check against.
+ * @return bool
+ */
+function is_post_type_archive( $post_types = '' ) {
+    global $wp_query;
+
+    return $wp_query->is_post_type_archive( $post_types );
+}
+    
+/**
  * Is the query for an attachment page?
  *
@@ -1040 +1056 @@
      */
     var $is_posts_page = false;
+
+    /**
+     * Set if query is for a post type archive.
+     *
+     * @since 3.1.0
+     * @access public
+     * @var bool
+     */
+    var $is_post_type_archive = false;
 
     /**
@@ -1076 +1101 @@
         $this->is_robots = false;
         $this->is_posts_page = false;
+        $this->is_post_type_archive = false;
     }
 
@@ -1235 +1261 @@
             $this->is_single = false;
         } else {
-        // Look for archive queries.  Dates, categories, authors, search.
+        // Look for archive queries.  Dates, categories, authors, search, post type archives.
 
             if ( !empty($qv['s']) ) {
@@ -1307 +1333 @@
                 $this->is_author = true;
 
-            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 )
+            if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
+                $post_type_obj = get_post_type_object( $qv['post_type'] );
+                if ( is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['archive'] )
+                    $this->is_post_type_archive = true;
+            }
+
+            if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
                 $this->is_archive = true;
         }
@@ -2637 +2666 @@
 
     /**
+     * Is the query for a post type archive page?
+     *
+     * @since 3.1.0
+     *
+     * @param mixed $post_types Optional. Post type or array of posts types to check against.
+     * @return bool
+     */
+    function is_post_type_archive( $post_types = '' ) {
+        if ( empty( $post_types ) || !$this->is_post_type_archive )
+            return (bool) $this->is_post_type_archive;
+
+        if ( ! isset( $this->posts[0] ) )
+            return false;
+
+        $post = $this->posts[0];
+
+        return in_array( $post->post_type, (array) $post_types );
+    }
+
+    /**
      * Is the query for an attachment page?
      *