Changeset 3541 for branches/2.0/bbp-includes/bbp-common-template.php

Timestamp:

10/10/2011 05:09:36 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Check query name in bbp_is_single_view(). Fixes #1651. Props GautamGupta for original patch.

File:

• branches/2.0/bbp-includes/bbp-common-template.php (modified) (2 diffs)

branches/2.0/bbp-includes/bbp-common-template.php

@@ -480 +480 @@
  * @since bbPress (r2789)
  *
- * @uses WP_Query Checks if WP_Query::bbp_is_view is true
+ * @global WP_Query $wp_query To check if WP_Query::bbp_is_view is true
+ * @uses bbp_get_query_name() To get the query name
  * @return bool Is it a view page?
  */
@@ -486 +487 @@
     global $wp_query;
 
+    // Assume false
+    $retval = false;
+
+    // Check query
     if ( !empty( $wp_query->bbp_is_view ) && ( true == $wp_query->bbp_is_view ) )
-        return true;
-
-    return false;
+        $retval = true;
+
+    // Check query name
+    if ( empty( $retval ) && bbp_is_query_name( 'bbp_single_view' ) )
+        $retval = true;
+
+    return (bool) apply_filters( 'bbp_is_single_view', $retval );
 }