# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: includes\common
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: template-tags.php
--- template-tags.php Base (BASE)
+++ template-tags.php Locally Modified (Based On LOCAL)
@@ -2471,34 +2471,61 @@
 	// Store original title to compare
 	$_title = $title;
 
+        // Title 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();
 
+	/** Edit *****************************************************************/
+
+	// Forum edit page
+	} elseif (bbp_is_forum_edit() ) {
+		$title['text'] = bbp_get_forum_title();
+		$title['format'] = __( 'Forum Edit: %s', 'bbpress' );                 
+
+	// Topic edit page
+	} elseif ( bbp_is_topic_edit() ) {
+		$title['text'] = bbp_get_topic_title();
+		$title['format'] = __( 'Topic Edit: %s', 'bbpress' );                 
+
+	// Reply edit page
+	} elseif ( bbp_is_reply_edit() ) {
+		$title['text'] = bbp_get_reply_title();
+		$title['format'] = __( 'Reply Edit: %s', 'bbpress' ); 
+                
+	// Topic tag edit page
+	} elseif ( bbp_is_topic_tag_edit() ) {
+		$title['text'] = bbp_get_topic_tag_name();
+		$title['format'] = __( 'Topic Tag Edit: %s', 'bbpress' );		
+
 	/** Singles ***************************************************************/
 
 	// Forum page
 	} elseif ( bbp_is_single_forum() ) {
-		$title = sprintf( __( 'Forum: %s', 'bbpress' ), bbp_get_forum_title() );
+		$title['text'] = bbp_get_forum_title();
+		$title['format'] = __( '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['format'] = __( '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 );
+	// Topic tag page
+	} elseif ( bbp_is_topic_tag() || get_query_var( 'bbp_topic_tag' ) ) {
+		$title['text'] = bbp_get_topic_tag_name();
+		$title['format'] = __( 'Topic Tag: %s', 'bbpress' );		
 
 	/** Users *****************************************************************/
 
@@ -2507,12 +2534,12 @@
 
 		// 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['format'] = __( '%s\'s Profile', 'bbpress' );                        
 		}
 
 	// Profile edit page
@@ -2520,26 +2547,39 @@
 
 		// 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['format'] = __( '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['format'] = __( '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 format/text
+        $title = apply_filters( 'bbp_raw_title_array', $title );
+        
+        // Set title array defaults
+        $title = wp_parse_args( $title, array( 
+                'text' => "",
+                'format' => '%s'
+        ) );
+        
+        // Get the formatted raw title
+        $title = sprintf( $title['format'], $title['text'] );
 
 	// Filter the raw title
 	$title = apply_filters( 'bbp_raw_title', $title, $sep, $seplocation );