Changeset 5085

Timestamp:

09/01/2011 03:48:35 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Fix bug where topic permalink would not calculate correctly in single topic view on some installations.

File:

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

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

@@ -540 +540 @@
 }
     function bp_get_the_topic_object_permalink() {
-        global $bp, $forum_template;
 
         // Currently this will only work with group forums, extended support in the future
         if ( bp_is_active( 'groups' ) )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum/' );
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_get_the_topic_object_slug() . '/forum' );
         else
             $permalink = '';
@@ -703 +702 @@
         global $forum_template, $bp;
 
-        if ( bp_is_active( 'groups' ) && !empty( $forum_template->topic->object_slug ) )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum' );
-        else if ( bp_is_single_item() )
+        // The topic is in a loop where its parent object is loaded
+        if ( bp_get_the_topic_object_slug() ) {
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_get_the_topic_object_slug() . '/forum' );
+
+        // We are viewing a single group topic, so use the current item
+        } elseif ( bp_is_group_forum_topic() ) {
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_current_item() . '/forum' );
+
+        // We are unsure what the context is, so fallback to forum root slug
+        } elseif ( bp_is_single_item() ) {
             $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . bp_current_item() );
-        else
+
+        // This is some kind of error situation, so use forum root
+        } else {
             $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() );
+        }
 
         return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'topic/' . $forum_template->topic->topic_slug ) );