Ticket #1764: common-template-tags.patch

template-tags.php

@@ -2471 +2471 @@
         // Store original title to compare
         $_title = $title;
 
+        // bbPress title args array.
+        $title = array(  );
+        
         /** Archives **************************************************************/
 
         // Forum Archive
         if ( bbp_is_forum_archive() ) {
-                $title = bbp_get_forum_archive_title();
+                $title['text'] = bbp_get_forum_archive_title();
 
         // Topic Archive
         } elseif ( bbp_is_topic_archive() ) {
-                $title = bbp_get_topic_archive_title();
+                $title['text'] = bbp_get_topic_archive_title();
 
         /** Singles ***************************************************************/
 
         // Forum page
         } elseif ( bbp_is_single_forum() ) {
-                $title = sprintf( __( 'Forum: %s', 'bbpress' ), bbp_get_forum_title() );
+                $title['text'] = bbp_get_forum_title();
+                $title['layout'] = __( 'Forum: %s', 'bbpress' );                 
 
         // Topic page
         } elseif ( bbp_is_single_topic() ) {
-                $title = sprintf( __( 'Topic: %s', 'bbpress' ), bbp_get_topic_title() );
+                $title['text'] = bbp_get_topic_title();
+                $title['layout'] = __( 'Topic: %s', 'bbpress' );                 
 
         // Replies
         } elseif ( bbp_is_single_reply() ) {
-                $title = bbp_get_reply_title();
+                $title['text'] = bbp_get_reply_title();
 
         // Topic tag page (or edit)
         } elseif ( bbp_is_topic_tag() || bbp_is_topic_tag_edit() || get_query_var( 'bbp_topic_tag' ) ) {
-                $term  = get_queried_object();
-                $title = sprintf( __( 'Topic Tag: %s', 'bbpress' ), $term->name );
+                $title['text'] = single_term_title( '', false );
+                $title['layout'] = __( 'Topic Tag: %s', 'bbpress' );            
 
         /** Users *****************************************************************/
 
@@ -2507 +2512 @@
 
                 // Current users profile
                 if ( bbp_is_user_home() ) {
-                        $title = __( 'Your Profile', 'bbpress' );
+                        $title['text'] = __( 'Your Profile', 'bbpress' );
 
                 // Other users profile
                 } else {
-                        $userdata = get_userdata( bbp_get_user_id() );
-                        $title    = sprintf( __( '%s\'s Profile', 'bbpress' ), $userdata->display_name );
+                        $title['text'] = get_userdata( bbp_get_user_id() )->display_name;
+                        $title['layout'] = __( '%s\'s Profile', 'bbpress' );                        
                 }
 
         // Profile edit page
@@ -2520 +2525 @@
 
                 // Current users profile
                 if ( bbp_is_user_home_edit() ) {
-                        $title = __( 'Edit Your Profile', 'bbpress' );
+                        $title['text'] = __( 'Edit Your Profile', 'bbpress' );
 
                 // Other users profile
                 } else {
-                        $userdata = get_userdata( bbp_get_user_id() );
-                        $title    = sprintf( __( 'Edit %s\'s Profile', 'bbpress' ), $userdata->display_name );
+                        $title['text'] = get_userdata( bbp_get_user_id() )->display_name;
+                        $title['layout'] = __( 'Edit %s\'s Profile', 'bbpress' );                        
                 }
 
         /** Views *****************************************************************/
 
         // Views
         } elseif ( bbp_is_single_view() ) {
-                $title = sprintf( __( 'View: %s', 'bbpress' ), bbp_get_view_title() );
+                $title['text'] = bbp_get_view_title();            
+                $title['layout'] = __( 'View: %s', 'bbpress' );
 
         /** Search ****************************************************************/
 
         // Search
         } elseif ( bbp_is_search() ) {
-                $title = bbp_get_search_title();
+                $title['text'] = bbp_get_search_title();
         }
+        
+        // Allow to change the title layout/text
+        $title = apply_filters( 'bbp_raw_title_args', $title );
+        
+        // Set title array defaults
+        $title = wp_parse_args( $title, array( 
+                'text' => null,
+                'layout' => '%s'
+        ) );
+        
+        // Set the raw title
+        $title = sprintf( $title['layout'], $title['text'] );
 
         // Filter the raw title
         $title = apply_filters( 'bbp_raw_title', $title, $sep, $seplocation );