Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.448.2.8
diff -u -p -r1.448.2.8 forum.module
--- modules/forum/forum.module	1 Mar 2010 11:32:00 -0000	1.448.2.8
+++ modules/forum/forum.module	11 Aug 2010 17:36:35 -0000
@@ -639,14 +639,14 @@ function _forum_new($tid) {
 function template_preprocess_forums(&$variables) {
   global $user;
 
-  $vid = variable_get('forum_nav_vocabulary', '');
-  $vocabulary = taxonomy_vocabulary_load($vid);
-  $title = !empty($vocabulary->name) ? $vocabulary->name : '';
+  // The page title for forum list and breadcrumb should be inherited
+  // from menu link title to follow menu title changes.
+  $title = menu_get_active_title();
 
-  // Breadcrumb navigation:
+  // Breadcrumb navigation.
   $breadcrumb[] = l(t('Home'), NULL);
   if ($variables['tid']) {
-    $breadcrumb[] = l($vocabulary->name, 'forum');
+    $breadcrumb[] = l($title, 'forum');
   }
   if ($variables['parents']) {
     $variables['parents'] = array_reverse($variables['parents']);
@@ -660,9 +660,13 @@ function template_preprocess_forums(&$va
     }
   }
   drupal_set_breadcrumb($breadcrumb);
-  drupal_set_title(check_plain($title));
 
   if ($variables['forums_defined'] = count($variables['forums']) || count($variables['parents'])) {
+    // Page title should be assigned to a viewing forum or container's name.
+    if ($variables['tid']) {
+      drupal_set_title($title);
+    }
+
     // Format the "post new content" links listing.
     $forum_types = array();