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

Timestamp:

02/01/2011 07:46:50 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Use bp_get_root_domain() in place of $bp->root_domain global

File:

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

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

@@ -395 +395 @@
 
                 /* Currently this will only work with group forums, extended support in the future */
-                return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug . '/forum/' );
+                return apply_filters( 'bp_get_the_topic_object_permalink', bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug . '/forum/' );
         }
 
@@ -548 +548 @@
 
                 if ( !empty( $forum_template->topic->object_slug ) )
-                        $permalink = trailingslashit( $bp->root_domain . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
                 else if ( !empty( $bp->is_single_item ) )
-                        $permalink = trailingslashit( $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item );
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
                 else
-                        $permalink = trailingslashit( $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_action );
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_action );
 
                 return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'forum/topic/' . $forum_template->topic->topic_slug ) );
@@ -663 +663 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_my_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/personal/' );
+                return apply_filters( 'bp_get_my_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/personal/' );
         }
 
@@ -672 +672 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_unreplied_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/unreplied/' );
+                return apply_filters( 'bp_get_unreplied_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/unreplied/' );
         }
 
@@ -682 +682 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_popular_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/popular/' );
+                return apply_filters( 'bp_get_popular_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/popular/' );
         }
 
@@ -691 +691 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_newest_forum_topics_link', $bp->root_domain . '/' . $bp->forums->slug . '/' );
+                return apply_filters( 'bp_get_newest_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/' );
         }
 
@@ -1101 +1101 @@
 
                 if ( $bp->is_single_item )
-                        $permalink = trailingslashit( $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item );
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
                 else
-                        $permalink = trailingslashit( $bp->root_domain . $bp->current_component . '/' . $bp->current_action );
+                        $permalink = trailingslashit( bp_get_root_domain() . $bp->current_component . '/' . $bp->current_action );
 
                 return apply_filters( 'bp_get_forum_permalink', trailingslashit( $permalink . 'forum' ) );
@@ -1114 +1114 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( $bp->root_domain . '/' . $bp->forums->root_slug ) );
+                return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . $bp->forums->root_slug ) );
         }
 
@@ -1137 +1137 @@
                 global $topic_template;
 
-                return apply_filters( 'bp_get_forum_action', $bp->root_domain . esc_attr( $_SERVER['REQUEST_URI'] ) );
+                return apply_filters( 'bp_get_forum_action', bp_get_root_domain() . esc_attr( $_SERVER['REQUEST_URI'] ) );
         }
 
@@ -1146 +1146 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_forum_topic_action', $bp->root_domain . esc_attr( $_SERVER['REQUEST_URI'] ) );
+                return apply_filters( 'bp_get_forum_topic_action', bp_get_root_domain() . esc_attr( $_SERVER['REQUEST_URI'] ) );
         }