Changeset 5670

Timestamp:

01/29/2012 05:45:11 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Use the component name in bp_modify_page_title() if one exists. Fall back on current_component if needed (and for backpat with components without names.)

File:

• trunk/bp-core/bp-core-filters.php (modified) (3 diffs)

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

@@ -244 +244 @@
  *
  * @global object $bp BuddyPress global settings
- * @global unknown $post
- * @global WP_Query $wp_query WordPress query object
  * @param string $title Original page title
  * @param string $sep How to separate the various items within the page title.
@@ -254 +252 @@
  */
 function bp_modify_page_title( $title, $sep, $seplocation ) {
-        global $bp, $post, $wp_query;
+        global $bp;
 
         // If this is not a BP page, just return the title produced by WP
@@ -268 +266 @@
         // Displayed user
         if ( !empty( $bp->displayed_user->fullname ) && !is_404() ) {
+
+                // Get the component's ID to try and get it's name
+                $component_id = $component_name = bp_current_component();
+                
+                // Use the actual component name
+                if ( !empty( $bp->{$component_id}->name ) ) {
+                        $component_name = $bp->{$component_id}->name;
+                        
+                // Fall back on the component ID (probably same as current_component)
+                } elseif ( !empty( $bp->{$component_id}->id ) ) {
+                        $component_name = $bp->{$component_id}->id;
+                }
+
                 // translators: "displayed user's name | canonicalised component name"
-                $title = strip_tags( sprintf( __( '%1$s | %2$s', 'buddypress' ), bp_get_displayed_user_fullname(), ucwords( bp_current_component() ) ) );
+                $title = strip_tags( sprintf( __( '%1$s | %2$s', 'buddypress' ), bp_get_displayed_user_fullname(), ucwords( $component_name ) ) );
 
         // A single group