Changeset 3384

Timestamp:

08/07/2011 02:11:44 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Add bbp_is_topic_tag() to is_bbpress() check. Fixes #1581. Props sorich87.

File:

• branches/plugin/bbp-includes/bbp-common-template.php (modified) (17 diffs)

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

@@ -64 +64 @@
  *
  * @since bbPress (r3251)
- * 
+ *
  * @uses is_post_type_archive() To check if we are looking at the forum archive
  * @uses bbp_get_forum_post_type() To get the forum post type ID
@@ -71 +71 @@
  */
 function bbp_is_forum_archive() {
-    
+
     // Default to false
     $retval = false;
@@ -78 +78 @@
     if ( is_post_type_archive( bbp_get_forum_post_type() ) || bbp_is_query_name( 'bbp_forum_archive' ) )
         $retval = true;
-    
+
     return (bool) apply_filters( 'bbp_is_forum_archive', $retval );
 }
@@ -158 +158 @@
  *
  * @since bbPress (r3251)
- * 
+ *
  * @uses is_post_type_archive() To check if we are looking at the topic archive
  * @uses bbp_get_topic_post_type() To get the topic post type ID
@@ -172 +172 @@
     if ( is_post_type_archive( bbp_get_topic_post_type() ) || bbp_is_query_name( 'bbp_topic_archive' ) )
         $retval = true;
-    
+
     return (bool) apply_filters( 'bbp_is_topic_archive', $retval );
 }
@@ -231 +231 @@
  *
  * @global bbPress $bbp
- * @return bool True if it's a topic tag, false if not 
+ * @return bool True if it's a topic tag, false if not
  */
 function bbp_is_topic_tag() {
@@ -502 +502 @@
     if ( bbp_is_forum_archive() )
         $bbp_classes[] = bbp_get_forum_post_type() . '-archive';
-    
+
     if ( bbp_is_topic_archive() )
         $bbp_classes[] = bbp_get_topic_post_type() . '-archive';
-    
+
     /** Components ************************************************************/
 
@@ -618 +618 @@
 
     elseif ( bbp_is_topic_archive() )
+        $retval = true;
+
+    elseif ( bbp_is_topic_tag() )
         $retval = true;
 
@@ -1090 +1093 @@
 
         <?php
-        
+
         wp_nonce_field( 'bbp-new-reply' );
 
@@ -1099 +1102 @@
 
         <?php endif;
-            
+
     }
 }
@@ -1401 +1404 @@
         // No custom home text
         if ( empty( $args['home_text'] ) ) {
-            
+
             // Set home text to page title
             if ( $front_id = get_option( 'page_on_front' ) ) {
                 $pre_front_text = get_the_title( $front_id );
-                
+
             // Default to 'Home'
             } else {
@@ -1421 +1424 @@
             $pre_root_text = bbp_get_forum_archive_title();
         }
-        
+
         /** Includes **********************************************************/
 
@@ -1437 +1440 @@
 
         /** Current Text ******************************************************/
-        
+
         // Forum archive
         if ( bbp_is_forum_archive() )
@@ -1497 +1500 @@
             'current_text'    => $pre_current_text
         );
-        $r = apply_filters( 'bbp_get_breadcrumb_pre', wp_parse_args( $args, $defaults ) );      
+        $r = apply_filters( 'bbp_get_breadcrumb_pre', wp_parse_args( $args, $defaults ) );
         extract( $r );
 
@@ -1512 +1515 @@
         // Do we want to include a link to the forum root?
         if ( !empty( $include_root ) || empty( $root_text ) ) {
-            
+
             // Page exists at root slug path, so use its permalink
             if ( $page = bbp_get_page_by_path( $bbp->root_slug ) ) {
                 $root_url = get_permalink( $page->ID );
-                
+
             // Use the root slug
             } else {
@@ -1783 +1786 @@
         if ( bbp_is_user_home() ) {
             $title = __( 'Your Profile', 'bbpress' );
-            
+
         // Other users profile
         } else {
@@ -1796 +1799 @@
         if ( bbp_is_user_home() ) {
             $title = __( 'Edit Your Profile', 'bbpress' );
-            
+
         // Other users profile
         } else {