Changeset 4650

Timestamp:

07/12/2011 02:58:25 AM (14 years ago)

Author:

johnjamesjacoby

Message:

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

Location:

trunk

Files:

• bp-core/bp-core-buddybar.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-buddybar.php

@@ -478 +478 @@
         <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
         <ul class="random-list">
-            <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . $bp->members->root_slug ) . '?random-member' ?>" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
+            <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '?random-member' ?>" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
 
             <?php if ( bp_is_active( 'groups' ) ) : ?>

trunk/bp-core/bp-core-filters.php

@@ -291 +291 @@
     } elseif ( bp_is_directory() ) {
         if ( !bp_current_component() )
-            $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug( $bp->members->slug ) );
+            $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug( bp_members_slug() ) );
         else
             $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug() );
@@ -315 +315 @@
 }
 add_filter( 'wp_title', 'bp_modify_page_title', 10, 3 );
-add_filter( 'bp_modify_page_title', 'wptexturize'   );
-add_filter( 'bp_modify_page_title', 'convert_chars' );
-add_filter( 'bp_modify_page_title', 'esc_html'      );
+add_filter( 'bp_modify_page_title', 'wptexturize'     );
+add_filter( 'bp_modify_page_title', 'convert_chars'   );
+add_filter( 'bp_modify_page_title', 'esc_html'        );
+
 ?>

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

@@ -842 +842 @@
             case 'members':
             default:
-                $slug = $bp->members->root_slug;
+                $slug = bp_get_members_root_slug();
                 break;
         }

trunk/bp-members/bp-members-functions.php

@@ -110 +110 @@
         // If we are using a members slug, include it.
         if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
-            $domain = bp_get_root_domain() . '/' . $bp->members->root_slug . '/' . $username;
+            $domain = bp_get_root_domain() . '/' . bp_get_members_root_slug() . '/' . $username;
         else
             $domain = bp_get_root_domain() . '/' . $username;