Ticket #12588: 12588.2.diff

wp-includes/query.php

@@ -145 +145 @@
  * @param string|int $author Optional. Is current page this author.
  * @return bool True if page is author or $author (if set).
  */
-function is_author ($author = '') {
+function is_author($author = '') {
         global $wp_query;
 
         if ( !$wp_query->is_author )
@@ -180 +180 @@
  * @param string|array $category Optional.
  * @return bool
  */
-function is_category ($category = '') {
+function is_category($category = '') {
         global $wp_query;
 
         if ( !$wp_query->is_category )
@@ -409 +409 @@
  * @param mixed $page Either page or list of pages to test against.
  * @return bool
  */
-function is_page ($page = '') {
+function is_page($page = '') {
         global $wp_query;
 
         if ( !$wp_query->is_page )
@@ -529 +529 @@
         if ( !$wp_query->is_single )
                 return false;
 
-        if ( empty( $post) )
+        if ( empty($post) )
                 return true;
 
         $post_obj = $wp_query->get_queried_object();
@@ -552 +552 @@
  * @since 1.5.0
  * @uses $wp_query
  *
+ * @param string|array $post_types Optional. Post type or types to check in current query.
  * @return bool
  */
-function is_singular() {
+function is_singular($post_types = '') {
         global $wp_query;
 
-        return $wp_query->is_singular;
+        if ( empty($post_types) || !$wp_query->is_singular )
+                return $wp_query->is_singular;
+
+        $post_obj = $wp_query->get_queried_object();
+
+        return in_array($post_obj->post_type, (array) $post_types);
 }
 
 /**
@@ -1237 +1243 @@
          *
          * @param string|array $query
          */
-        function parse_query($query ) {
+        function parse_query($query) {
                 if ( !empty($query) || !isset($this->query) ) {
                         $this->init();
                         if ( is_array($query) )