Changeset 2641 for trunk/bp-forums/bp-forums-templatetags.php

Timestamp:

02/10/2010 12:29:59 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1789

File:

• trunk/bp-forums/bp-forums-templatetags.php (modified) (3 diffs)

trunk/bp-forums/bp-forums-templatetags.php

@@ -40 +40 @@
                 break;
 
-            case 'tag':
-                $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'tag', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
+            case 'tags':
+                $this->topics = bp_forums_get_forum_topics( array( 'user_id' => $user_id, 'type' => 'tags', 'filter' => $search_terms, 'forum_id' => $forum_id, 'page' => $this->pag_page, 'per_page' => $this->pag_num, 'show_stickies' => $no_stickies ) );
                 break;
         }
@@ -178 +178 @@
     }
 
-    /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
-    if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
-        $search_terms = $bp->action_variables[0];
-        $type = 'tags';
-    }
-
     /* If $_GET['fs'] is set, let's auto populate the search_terms var */
     if ( $bp->is_directory && !empty( $_GET['fs'] ) )
@@ -206 +200 @@
     extract( $r );
 
+    /* If we're viewing a tag URL in the directory, let's override the type and set it to tags and the filter to the tag name */
+    if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
+        $search_terms = $bp->action_variables[0];
+        $type = 'tags';
+    }
+
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms );
     return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );