Changeset 3923

Timestamp:

01/25/2011 10:23:05 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Fix incorrect title tag when components are not in root directory

Location:

trunk/bp-core

Files:

• bp-core-component.php (modified) (1 diff)
• bp-core-hooks.php (modified) (1 diff)
• bp-core-template.php (modified) (2 diffs)

trunk/bp-core/bp-core-component.php

@@ -220 +220 @@
         }
 
-
+        /**
+         * Setup the component title
+         *
+         * @since Buddypress {unknown}
+         *
+         * @uses do_action() Calls 'bp_{@link bp_Component::name}_setup_title'
+         */
         function _setup_title( ) {
-                
+                do_action(  'bp_' . $this->id . '_setup_title' );
         }
 

trunk/bp-core/bp-core-hooks.php

@@ -24 +24 @@
 // Setup the navigation menu
 add_action( 'bp_init',    'bp_setup_nav',            8 );
+
+// Setup the title
+add_action( 'bp_init',    'bp_setup_title',          8 );
 
 // Setup widgets

trunk/bp-core/bp-core-template.php

@@ -233 +233 @@
         // A single item of a component
         } elseif ( bp_is_single_item() ) {
-                $title = ucwords( $bp->current_component ) . ' | ' . $bp->bp_options_title . ' | '; // . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'];
+                $title = bp_get_name_from_root_slug() . ' | ' . $bp->bp_options_title . ' | ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'];
 
         // An index or directory
         } elseif ( bp_is_directory() ) {
-                if ( !$bp->current_component )
-                        $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( BP_MEMBERS_SLUG ) );
+                if ( !bp_current_component() )
+                        $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( $bp->members->slug ) );
                 else
-                        $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( $bp->current_component ) );
+                        $title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug() );
 
         // Sign up page
@@ -621 +621 @@
         }
 
+/**
+ * Return the component name based on the current root slug
+ *
+ * @since BuddyPress {r3923}
+ * @global obj $bp
+ * @param str $root_slug Needle to our active component haystack
+ * @return mixed False if none found, component name if found
+ */
+function bp_get_name_from_root_slug( $root_slug = '' ) {
+
+        // If no slug is passed, look at current_component
+        if ( empty( $root_slug ) ) {
+                global $bp;
+                $root_slug = $bp->current_component;
+        }
+
+        // No current component or root slug, so flee
+        if ( empty( $root_slug ) )
+                return false;
+
+        // Loop through active components and look for a match
+        foreach ( $bp->active_components as $component => $id )
+                if (    isset( $bp->{$component}->root_slug ) &&
+                                !empty( $bp->{$component}->root_slug ) &&
+                                $bp->{$component}->root_slug == $root_slug )
+                        return $bp->{$component}->name;
+
+        return false;
+}
+
 /** is_() functions to determine the current page *****************************/