Changeset 4149 for trunk/bp-forums/bp-forums-template.php

Timestamp:

03/23/2011 09:14:24 PM (15 years ago)

Author:

boonebgorges

Message:

Modifies bp_forum_topic_tag_list() to use tag data from the topic_template global. Displays the topic tags underneath the topic title on the single topic page. Fixes #2281

File:

• trunk/bp-forums/bp-forums-template.php (modified) (4 diffs)

trunk/bp-forums/bp-forums-template.php

@@ -822 +822 @@
                         }
                 }
+                
+                // Load topic tags
+                $this->topic_tags = bb_get_topic_tags( $this->topic_id );
 
                 if ( (int)$this->total_post_count && (int)$this->pag_num ) {
@@ -914 +917 @@
                         return false;
         }
-
+        
         return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), $topic_template );
 }
@@ -1193 +1196 @@
          */
         function bp_get_forum_topic_tag_list( $format = 'string' ) {
-                do_action( 'bbpress_init' );
+                global $topic_template;
                 
-                // Pull up the tag objects
-                $tags_data = bb_get_topic_tags( bp_get_the_topic_id() );
+                $tags_data = !empty( $topic_template->topic_tags ) ? $topic_template->topic_tags : false;
                 
-                // Convert them to a comma-separated string
                 $tags = array();
-                foreach( $tags_data as $tag_data ) {
-                        $tags[] = $tag_data->name;
+                
+                if ( $tags_data ) {
+                        foreach( $tags_data as $tag_data ) {
+                                $tags[] = $tag_data->name;
+                        }
                 }
                 
@@ -1210 +1214 @@
         }
 
+/**
+ * Returns true if the current topic has tags
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @return bool
+ */
+function bp_forum_topic_has_tags() {
+        global $topic_template;
+        
+        $has_tags = false;
+        
+        if ( !empty( $topic_template->topic_tags ) )
+                $has_tags = true;
+        
+        return apply_filters( 'bp_forum_topic_has_tags', $has_tags );
+}
+
 function bp_forum_action() {
         echo bp_get_forum_action();