Changeset 4652

Timestamp:

07/12/2011 03:29:12 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->forums->slug and $bp->forums->root_slug. See #3325.

Location:

trunk

Files:

• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-forums/bp-forums-filters.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (7 diffs)

trunk/bp-core/bp-core-functions.php

@@ -832 +832 @@
 
                         case 'forums':
-                                $slug = bp_is_active( 'forums' ) ? $bp->forums->root_slug : '';
+                                $slug = bp_is_active( 'forums' ) ? bp_get_groups_root_slug() : '';
                                 $query_string = '/?fs=';
                                 break;

trunk/bp-forums/bp-forums-filters.php

@@ -76 +76 @@
         global $bp;
 
-        return apply_filters( 'bp_forums_filter_tag_link', bp_get_root_domain() . '/' . $bp->forums->root_slug . '/tag/' . $tag . '/' );
+        return apply_filters( 'bp_forums_filter_tag_link', bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/tag/' . $tag . '/' );
 }
 add_filter( 'bb_get_tag_link', 'bp_forums_filter_tag_link', 10, 4);

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

@@ -689 +689 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_my_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/personal/' );
+                return apply_filters( 'bp_get_my_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/personal/' );
         }
 
@@ -698 +698 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_unreplied_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/unreplied/' );
+                return apply_filters( 'bp_get_unreplied_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/unreplied/' );
         }
 
@@ -708 +708 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_popular_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/popular/' );
+                return apply_filters( 'bp_get_popular_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/popular/' );
         }
 
@@ -717 +717 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_newest_forum_topics_link', bp_get_root_domain() . '/' . $bp->forums->slug . '/' );
+                return apply_filters( 'bp_get_newest_forum_topics_link', bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' );
         }
 
@@ -726 +726 @@
                 global $bp;
 
-                if ( !bp_is_directory() || !$bp->current_action )
+                if ( !bp_is_directory() || !bp_current_action() )
                         return 'newest';
 
-
-                return apply_filters( 'bp_get_forum_topic_type', $bp->current_action );
+                return apply_filters( 'bp_get_forum_topic_type', bp_current_action() );
         }
 
@@ -739 +738 @@
                 global $bp;
 
-                if ( bp_is_directory() && $bp->forums->slug == $bp->current_component )
-                        return apply_filters( 'bp_get_forums_tag_name', $bp->action_variables[0] );
+                if ( bp_is_directory() && bp_is_forums_component() && !empty( $bp->action_variables[0] ) )
+                        $tag_name = $bp->action_variables[0];
+                else
+                        $tag_name = false;
+
+                return apply_filters( 'bp_get_forums_tag_name', $tag_name );
         }
 
@@ -1177 +1180 @@
                 global $bp;
 
-                return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . $bp->forums->root_slug ) );
+                return apply_filters( 'bp_get_forum_directory_permalink', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) );
         }