Changeset 9466 for trunk/src/bp-forums/bp-forums-template.php

Timestamp:

02/09/2015 11:34:12 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all references to bp_get_root_domain() . '/' . bp_get_groups_root_slug() with the appropriate bp_get_groups_directory_permalink() function. This ensures all usages and filters are applied uniformly. See #4954 for the long-game here.

File:

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

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

@@ -1009 +1009 @@
 
         // 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() . '/' . bp_get_the_topic_object_slug() . '/forum' );
-        else
+        if ( bp_is_active( 'groups' ) ) {
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_get_the_topic_object_slug() . '/forum' );
+        } else {
             $permalink = '';
+        }
 
         /**
@@ -1426 +1427 @@
      */
     function bp_get_the_topic_permalink() {
-        global $forum_template, $bp;
+        global $forum_template;
 
         // 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' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . 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' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_current_item() . '/forum' );
 
         // We are unsure what the context is, so fallback to forum root slug
@@ -2712 +2713 @@
      */
     function bp_get_forum_permalink( $forum_id = 0 ) {
-        global $bp;
 
         if ( bp_is_groups_component() ) {
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_current_item() . '/forum' );
+            $permalink = trailingslashit( bp_get_groups_directory_permalink() . bp_current_item() . '/forum' );
         } else {
             if ( empty( $forum_id ) ) {