Changeset 16447

Timestamp:

11/18/2010 03:19:08 AM (13 years ago)

Author:

nacin

Message:

Allow is_feed() to drill down the feed being checked. props johnbillion for initial patch, fixes #15460.

File:

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

trunk/wp-includes/query.php

@@ -310 +310 @@
  * @uses $wp_query
  *
+ * @param string|array $feeds Optional feed types to check.
  * @return bool
  */
-function is_feed() {
-    global $wp_query;
-
-    return $wp_query->is_feed();
+function is_feed( $feeds = '' ) {
+    global $wp_query;
+
+    return $wp_query->is_feed( $feeds );
 }
 
@@ -2937 +2938 @@
      * @since 3.1.0
      *
+     * @param string|array $feeds Optional feed types to check.
      * @return bool
      */
-    function is_feed() {
-        return (bool) $this->is_feed;
+    function is_feed( $feeds = '' ) {
+        if ( empty( $feeds ) || ! $this->is_feed )
+            return (bool) $this->is_feed;
+        $qv = $this->get( 'feed' );
+        if ( 'feed' == $qv )
+            $qv = get_default_feed();
+        return in_array( $qv, (array) $feeds );
     }