Index: includes/batch.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/batch.inc,v
retrieving revision 1.15
diff -u -p -r1.15 batch.inc
--- includes/batch.inc	14 Apr 2008 17:48:33 -0000	1.15
+++ includes/batch.inc	26 May 2008 01:48:21 -0000
@@ -69,10 +69,10 @@ function _batch_start() {
 function _batch_progress_page_js() {
   $batch = batch_get();
 
-  // The first batch set gets to set the page title
-  // and the initialization and error messages.
+  // The first batch set gets to set the page title and the initialization and
+  // error messages. They were sanitized in batch_set().
   $current_set = _batch_current_set();
-  drupal_set_title($current_set['title']);
+  drupal_set_title($current_set['title'], TRUE);
   drupal_add_js('misc/progress.js', 'core', 'header', FALSE, FALSE);
 
   $url = url($batch['url'], array('query' => array('id' => $batch['id'])));
@@ -115,7 +115,7 @@ function _batch_progress_page_nojs() {
   $batch =& batch_get();
   $current_set = _batch_current_set();
 
-  drupal_set_title($current_set['title']);
+  drupal_set_title($current_set['title'], TRUE);
 
   $new_op = 'do_nojs';
 
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.272
diff -u -p -r1.272 form.inc
--- includes/form.inc	6 May 2008 12:18:45 -0000	1.272
+++ includes/form.inc	26 May 2008 01:48:21 -0000
@@ -2419,6 +2419,12 @@ function batch_set($batch_definition) {
       'progress_message' => $t('Remaining @remaining of @total.'),
       'error_message' => $t('An error has occurred.'),
     );
+    // The batch definition may contain unsanitized user input.
+    foreach (array_keys($defaults) as $key) {
+      if (isset($batch_definition[$key])) {
+        $batch_definition[$key] = filter_xss($batch_definition[$key]);
+      }
+    }
     $batch_set = $init + $batch_definition + $defaults;
 
     // Tweak init_message to avoid the bottom of the page flickering down after init phase.
Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.22
diff -u -p -r1.22 path.inc
--- includes/path.inc	14 Apr 2008 17:48:33 -0000	1.22
+++ includes/path.inc	26 May 2008 01:48:21 -0000
@@ -191,15 +191,19 @@ function drupal_get_title() {
  * @param $title
  *   Optional string value to assign to the page title; or if set to NULL
  *   (default), leaves the current title unchanged.
+ * @param $html
+ *   Optional boolean - normally should be FALSE. Only set to TRUE if $title
+ *   contains HTML tags and if you have removed any possible dangerous code 
+ *   from $title using a function like check_plain() or filter_xss().
  *
  * @return
  *   The updated title of the current page.
  */
-function drupal_set_title($title = NULL) {
+function drupal_set_title($title = NULL, $html = FALSE) {
   static $stored_title;
 
   if (isset($title)) {
-    $stored_title = $title;
+    $stored_title = $html ? $title : check_plain($title);
   }
   return $stored_title;
 }
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.14
diff -u -p -r1.14 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc	15 May 2008 21:27:32 -0000	1.14
+++ modules/aggregator/aggregator.pages.inc	26 May 2008 01:48:21 -0000
@@ -37,7 +37,7 @@ function aggregator_page_source($arg1, $
   // $arg1 is $form_state and $arg2 is $feed. Otherwise, $arg1 is $feed.
   $feed = is_array($arg2) ? $arg2 : $arg1;
   $feed = (object)$feed;
-  drupal_set_title(check_plain($feed->title));
+  drupal_set_title($feed->title);
   $feed_source = theme('aggregator_feed_source', $feed);
 
   // It is safe to include the fid in the query because it's loaded from the
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.17
diff -u -p -r1.17 block.admin.inc
--- modules/block/block.admin.inc	15 May 2008 21:30:02 -0000	1.17
+++ modules/block/block.admin.inc	26 May 2008 01:48:21 -0000
@@ -175,7 +175,7 @@ function block_admin_configure(&$form_st
   // Get the block subject for the page title.
   $info = module_invoke($module, 'block', 'list');
   if (isset($info[$delta])) {
-    drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])));
+    drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info'])), TRUE);
   }
 
   // Standard block configurations.
Index: modules/book/book.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 book.admin.inc
--- modules/book/book.admin.inc	15 May 2008 21:19:24 -0000	1.10
+++ modules/book/book.admin.inc	26 May 2008 01:48:21 -0000
@@ -70,7 +70,7 @@ function book_admin_settings_validate($f
  * @ingroup forms.
  */
 function book_admin_edit($form_state, $node) {
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title($node->title);
   $form = array();
   $form['#node'] = $node;
   $form['table'] = _book_admin_table($node);
Index: modules/book/book.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v
retrieving revision 1.7
diff -u -p -r1.7 book.pages.inc
--- modules/book/book.pages.inc	15 May 2008 21:19:24 -0000	1.7
+++ modules/book/book.pages.inc	26 May 2008 01:48:21 -0000
@@ -90,7 +90,7 @@ function book_export_html($nid) {
  * Menu callback; show the outline form for a single node.
  */
 function book_outline($node) {
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title($node->title);
   return drupal_get_form('book_outline_form', $node);
 }
 
Index: modules/contact/contact.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v
retrieving revision 1.10
diff -u -p -r1.10 contact.pages.inc
--- modules/contact/contact.pages.inc	19 Apr 2008 14:44:34 -0000	1.10
+++ modules/contact/contact.pages.inc	26 May 2008 01:48:21 -0000
@@ -164,7 +164,7 @@ function contact_user_page($account) {
     $output = t("You cannot send more than %number messages per hour. Please try again later.", array('%number' => variable_get('contact_hourly_threshold', 3)));
   }
   else {
-    drupal_set_title(check_plain($account->name));
+    drupal_set_title($account->name);
     $output = drupal_get_form('contact_mail_user', $account);
   }
 
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.11
diff -u -p -r1.11 filter.admin.inc
--- modules/filter/filter.admin.inc	14 Apr 2008 17:48:37 -0000	1.11
+++ modules/filter/filter.admin.inc	26 May 2008 01:48:21 -0000
@@ -302,7 +302,7 @@ function filter_admin_delete_submit($for
  * Menu callback; display settings defined by a format's filters.
  */
 function filter_admin_configure_page($format) {
-  drupal_set_title(t("Configure %format", array('%format' => $format->name)));
+  drupal_set_title(t("Configure %format", array('%format' => $format->name)), TRUE);
   return drupal_get_form('filter_admin_configure', $format);
 }
 
@@ -343,7 +343,7 @@ function filter_admin_configure_submit($
  * Menu callback; display form for ordering filters for a format.
  */
 function filter_admin_order_page($format) {
-  drupal_set_title(t("Rearrange %format", array('%format' => $format->name)));
+  drupal_set_title(t("Rearrange %format", array('%format' => $format->name)), TRUE);
   return drupal_get_form('filter_admin_order', $format);
 }
 
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.456
diff -u -p -r1.456 forum.module
--- modules/forum/forum.module	6 May 2008 12:18:47 -0000	1.456
+++ modules/forum/forum.module	26 May 2008 01:48:21 -0000
@@ -664,7 +664,7 @@ function template_preprocess_forums(&$va
     }
   }
   drupal_set_breadcrumb($breadcrumb);
-  drupal_set_title(check_plain($title));
+  drupal_set_title($title);
 
   if ($variables['forums_defined'] = count($variables['forums']) || count($variables['parents'])) {
     // Format the "post new content" links listing.
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.966
diff -u -p -r1.966 node.module
--- modules/node/node.module	15 May 2008 21:40:31 -0000	1.966
+++ modules/node/node.module	26 May 2008 01:48:21 -0000
@@ -1096,7 +1096,7 @@ function node_build_content($node, $teas
  */
 function node_show($node, $cid, $message = FALSE) {
   if ($message) {
-    drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))));
+    drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))), TRUE);
   }
   $output = node_view($node, FALSE, TRUE);
 
@@ -1791,7 +1791,7 @@ function node_page_default() {
  * Menu callback; view a single node.
  */
 function node_page_view($node, $cid = NULL) {
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title($node->title);
   return node_show($node, $cid);
 }
 
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.30
diff -u -p -r1.30 node.pages.inc
--- modules/node/node.pages.inc	14 Apr 2008 17:48:38 -0000	1.30
+++ modules/node/node.pages.inc	26 May 2008 01:48:21 -0000
@@ -521,7 +521,7 @@ function node_delete_confirm_submit($for
  * Generate an overview table of older revisions of a node.
  */
 function node_revision_overview($node) {
-  drupal_set_title(t('Revisions for %title', array('%title' => $node->title)));
+  drupal_set_title(t('Revisions for %title', array('%title' => $node->title)), TRUE);
 
   $header = array(t('Revision'), array('data' => t('Operations'), 'colspan' => 2));
 
Index: modules/openid/openid.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.pages.inc,v
retrieving revision 1.6
diff -u -p -r1.6 openid.pages.inc
--- modules/openid/openid.pages.inc	14 Apr 2008 17:48:38 -0000	1.6
+++ modules/openid/openid.pages.inc	26 May 2008 01:48:22 -0000
@@ -28,7 +28,7 @@ function openid_authentication_page() {
  * Menu callback; Manage OpenID identities for the specified user.
  */
 function openid_user_identities($account) {
-  drupal_set_title(check_plain($account->name));
+  drupal_set_title($account->name);
   drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css', 'module');
 
   // Check to see if we got a response
Index: modules/path/path.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v
retrieving revision 1.8
diff -u -p -r1.8 path.admin.inc
--- modules/path/path.admin.inc	14 Apr 2008 17:48:38 -0000	1.8
+++ modules/path/path.admin.inc	26 May 2008 01:48:22 -0000
@@ -67,7 +67,7 @@ function path_admin_overview($keys = NUL
 function path_admin_edit($pid = 0) {
   if ($pid) {
     $alias = path_load($pid);
-    drupal_set_title(check_plain($alias['dst']));
+    drupal_set_title($alias['dst']);
     $output = drupal_get_form('path_admin_form', $alias);
   }
   else {
Index: modules/poll/poll.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v
retrieving revision 1.6
diff -u -p -r1.6 poll.pages.inc
--- modules/poll/poll.pages.inc	15 May 2008 20:55:58 -0000	1.6
+++ modules/poll/poll.pages.inc	26 May 2008 01:48:22 -0000
@@ -28,7 +28,7 @@ function poll_page() {
  * Callback for the 'votes' tab for polls you can see other votes on
  */
 function poll_votes($node) {
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title($node->title);
   $output = t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.');
 
   $header[] = array('data' => t('Visitor'), 'field' => 'u.name');
@@ -51,7 +51,7 @@ function poll_votes($node) {
  * Callback for the 'results' tab for polls you can vote on
  */
 function poll_results($node) {
-  drupal_set_title(check_plain($node->title));
+  drupal_set_title($node->title);
   $node->show_results = TRUE;
   return node_show($node, 0);
 }
Index: modules/profile/profile.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 profile.admin.inc
--- modules/profile/profile.admin.inc	14 Apr 2008 17:48:41 -0000	1.10
+++ modules/profile/profile.admin.inc	26 May 2008 01:48:22 -0000
@@ -175,7 +175,7 @@ function profile_field_form(&$form_state
         drupal_not_found();
         return;
       }
-      drupal_set_title(t('edit %title', array('%title' => $edit['title'])));
+      drupal_set_title(t('edit %title', array('%title' => $edit['title'])), TRUE);
       $form['fid'] = array('#type' => 'value',
         '#value' => $fid,
       );
@@ -193,7 +193,7 @@ function profile_field_form(&$form_state
       return;
     }
     $type = $arg;
-    drupal_set_title(t('add new %type', array('%type' => $types[$type])));
+    drupal_set_title(t('add new %type', array('%type' => $types[$type])), TRUE);
     $edit = array('name' => 'profile_');
     $form['type'] = array('#type' => 'value', '#value' => $type);
   }
Index: modules/profile/profile.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v
retrieving revision 1.2
diff -u -p -r1.2 profile.pages.inc
--- modules/profile/profile.pages.inc	8 Dec 2007 14:06:22 -0000	1.2
+++ modules/profile/profile.pages.inc	26 May 2008 01:48:22 -0000
@@ -73,7 +73,7 @@ function profile_browse() {
       $title = check_plain($field->page);
     }
 
-    drupal_set_title($title);
+    drupal_set_title($title, TRUE);
     return $output;
   }
   else if ($name && !$field->fid) {
Index: modules/statistics/statistics.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v
retrieving revision 1.8
diff -u -p -r1.8 statistics.admin.inc
--- modules/statistics/statistics.admin.inc	7 May 2008 19:17:50 -0000	1.8
+++ modules/statistics/statistics.admin.inc	26 May 2008 01:48:22 -0000
@@ -64,7 +64,7 @@ function statistics_top_pages() {
     $rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
   }
 
-  drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+  drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), TRUE);
   $output = theme('table', $header, $rows);
   $output .= theme('pager', NULL, 30, 0);
   return $output;
@@ -97,7 +97,7 @@ function statistics_top_visitors() {
     $rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
   }
 
-  drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+  drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), TRUE);
   $output = theme('table', $header, $rows);
   $output .= theme('pager', NULL, 30, 0);
   return $output;
@@ -109,7 +109,7 @@ function statistics_top_visitors() {
 function statistics_top_referrers() {
   $query = "SELECT url, COUNT(url) AS hits, MAX(timestamp) AS last FROM {accesslog} WHERE url NOT LIKE '%%%s%%' AND url <> '' GROUP BY url";
   $query_cnt = "SELECT COUNT(DISTINCT(url)) FROM {accesslog} WHERE url <> '' AND url NOT LIKE '%%%s%%'";
-  drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+  drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))), TRUE);
 
   $header = array(
     array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
Index: modules/statistics/statistics.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.pages.inc,v
retrieving revision 1.3
diff -u -p -r1.3 statistics.pages.inc
--- modules/statistics/statistics.pages.inc	14 Apr 2008 17:48:41 -0000	1.3
+++ modules/statistics/statistics.pages.inc	26 May 2008 01:48:22 -0000
@@ -29,7 +29,7 @@ function statistics_node_tracker() {
       $rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 4));
     }
 
-    drupal_set_title(check_plain($node->title));
+    drupal_set_title($node->title);
     $output = theme('table', $header, $rows);
     $output .= theme('pager', NULL, 30, 0);
     return $output;
@@ -60,7 +60,7 @@ function statistics_user_tracker() {
       $rows[] = array(array('data' => t('No statistics available.'), 'colspan' => 3));
     }
 
-    drupal_set_title(check_plain($account->name));
+    drupal_set_title($account->name);
     $output = theme('table', $header, $rows);
     $output .= theme('pager', NULL, 30, 0);
     return $output;
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.602
diff -u -p -r1.602 system.module
--- modules/system/system.module	7 May 2008 19:17:50 -0000	1.602
+++ modules/system/system.module	26 May 2008 01:48:22 -0000
@@ -1273,7 +1273,8 @@ function system_node_type($op, $info) {
  *   The form.
  */
 function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $no = NULL, $name = 'confirm') {
-  $description = isset($description) ? $description : t('This action cannot be undone.');
+  // The description may contain user input, so filter out any scripts.
+  $description = isset($description) ? filter_xss_admin($description) : t('This action cannot be undone.');
 
   // Prepare cancel link
   $query = $fragment = NULL;
@@ -1284,7 +1285,8 @@ function confirm_form($form, $question, 
   }
   $cancel = l($no ? $no : t('Cancel'), $path, array('query' => $query, 'fragment' => $fragment));
 
-  drupal_set_title($question);
+  // The question may contain user input, so filter out any scripts.
+  drupal_set_title(filter_xss($question), TRUE);
 
   // Confirm form fails duplication check, as the form values rarely change -- so skip it.
   $form['#skip_duplicate_check'] = TRUE;
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.3
diff -u -p -r1.3 system.test
--- modules/system/system.test	19 May 2008 19:28:39 -0000	1.3
+++ modules/system/system.test	26 May 2008 01:48:22 -0000
@@ -193,3 +193,68 @@ class IPAddressBlocking extends DrupalWe
     $this->assertText(t('You may not block your own IP address.'));
   }
 }
+
+class PageTitleFiltering extends DrupalWebTestCase {
+  protected $content_user;
+  protected $saved_title;
+
+  /**
+   * Implementation of getInfo().
+   */
+  function getInfo() {
+    return array(
+      'name' => t('HTML in page titles'),
+      'description' => t('Tests correct handling or conversion by drupal_set_title() and drupal_get_title().'),
+      'group' => t('System')
+    );
+  }
+
+  /**
+   * Implementation of setUp().
+   */
+  function setUp() {
+    parent::setUp();
+
+    $this->content_user = $this->drupalCreateUser(array('create page content', 'access content'));
+    $this->drupalLogin($this->content_user);
+    $this->saved_title = drupal_get_title();
+  }
+
+  /**
+   * Reset page title.
+   */
+  function tearDown() {
+    // Restore the page title.
+    drupal_set_title($this->saved_title, TRUE);
+
+    parent::tearDown();
+  }
+
+  /**
+   * Tests the handling of HTML by drupal_set_title() and drupal_get_title()
+   */
+  function testTitleTags() {
+     $title = "string with <em>HTML</em>";
+     // drupal_set_title's $html is FALSE by default, so the title should be
+     // returned with check_plain().
+     drupal_set_title($title);
+     $this->assertTrue(strpos(drupal_get_title(), '<em>') === FALSE, t('Tags in title converted to entities when $html is FALSE.'));
+     // drupal_set_title's $html is passed as TRUE, so the title should be
+     // returned with HTML.
+     drupal_set_title($title, TRUE);
+     $this->assertTrue(strpos(drupal_get_title(), '<em>') !== FALSE, t('Tags in title are not converted to entities when $html is TRUE.'));
+     // Generate node content.
+     $edit = array(
+       'title' => '!SimpleTest! ' . $title . $this->randomName(20),
+       'body' => '!SimpleTest! test body' . $this->randomName(200),
+     );
+    //Create the node with HTML in the title
+    $this->drupalPost('node/add/page', $edit, t('Save'));
+
+    $node = node_load(array('title' => $edit['title']));
+    $this->assertNotNull($node, 'Node created and found in database');
+    $this->drupalGet("node/" . $node->nid);
+    $this->assertText(check_plain($edit['title']), 'Check to make sure tags in the node title are converted.');
+  }
+}
+
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.25
diff -u -p -r1.25 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	14 Apr 2008 17:48:42 -0000	1.25
+++ modules/taxonomy/taxonomy.admin.inc	26 May 2008 01:48:22 -0000
@@ -258,7 +258,7 @@ function taxonomy_overview_terms(&$form_
     return taxonomy_vocabulary_confirm_reset_alphabetical($form_state, $vocabulary->vid);
   }
 
-  drupal_set_title(t('Terms in %vocabulary', array('%vocabulary' => $vocabulary->name)));
+  drupal_set_title(t('Terms in %vocabulary', array('%vocabulary' => $vocabulary->name)), TRUE);
   $form = array(
     '#vocabulary' => (array)$vocabulary,
     '#tree' => TRUE,
@@ -628,7 +628,7 @@ function theme_taxonomy_overview_terms($
  * Menu callback; return the edit form for a new term after setting the title.
  */
 function taxonomy_add_term_page($vocabulary) {
-  drupal_set_title(t('Add term to %vocabulary', array('%vocabulary' => $vocabulary->name)));
+  drupal_set_title(t('Add term to %vocabulary', array('%vocabulary' => $vocabulary->name)), TRUE);
   return drupal_get_form('taxonomy_form_term' , $vocabulary);
 }
 
Index: modules/taxonomy/taxonomy.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v
retrieving revision 1.11
diff -u -p -r1.11 taxonomy.pages.inc
--- modules/taxonomy/taxonomy.pages.inc	14 Apr 2008 17:48:42 -0000	1.11
+++ modules/taxonomy/taxonomy.pages.inc	26 May 2008 01:48:22 -0000
@@ -25,7 +25,7 @@ function taxonomy_term_page($str_tids = 
     }
 
     if ($names) {
-      $title = check_plain(implode(', ', $names));
+      $title = implode(', ', $names);
       drupal_set_title($title);
 
       switch ($op) {
Index: modules/tracker/tracker.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v
retrieving revision 1.6
diff -u -p -r1.6 tracker.pages.inc
--- modules/tracker/tracker.pages.inc	14 Apr 2008 17:48:42 -0000	1.6
+++ modules/tracker/tracker.pages.inc	26 May 2008 01:48:22 -0000
@@ -19,7 +19,7 @@ function tracker_page($account = NULL, $
       // When viewed from user/%user/track, display the name of the user
       // as page title -- the tab title remains Track so this needs to be done
       // here and not in the menu definiton.
-      drupal_set_title(check_plain($account->name));
+      drupal_set_title($account->name);
     }
   // TODO: These queries are very expensive, see http://drupal.org/node/105639
     $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC';
Index: modules/translation/translation.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.pages.inc,v
retrieving revision 1.3
diff -u -p -r1.3 translation.pages.inc
--- modules/translation/translation.pages.inc	14 Apr 2008 17:48:42 -0000	1.3
+++ modules/translation/translation.pages.inc	26 May 2008 01:48:22 -0000
@@ -54,6 +54,6 @@ function translation_node_overview($node
     $rows[] = array($language_name, $title, $status, implode(" | ", $options));
   }
 
-  drupal_set_title(t('Translations of %title', array('%title' => $node->title)));
+  drupal_set_title(t('Translations of %title', array('%title' => $node->title)), TRUE);
   return theme('table', $header, $rows);
 }
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.13
diff -u -p -r1.13 user.pages.inc
--- modules/user/user.pages.inc	14 Apr 2008 17:48:43 -0000	1.13
+++ modules/user/user.pages.inc	26 May 2008 01:48:22 -0000
@@ -147,7 +147,7 @@ function user_logout() {
  * Menu callback; Displays a user or user profile page.
  */
 function user_view($account) {
-  drupal_set_title(check_plain($account->name));
+  drupal_set_title($account->name);
   // Retrieve all profile fields and attach to $account->content.
   user_build_content($account);
 
@@ -218,7 +218,7 @@ function template_preprocess_user_profil
  * @see user_edit_submit()
  */
 function user_edit($account, $category = 'account') {
-  drupal_set_title(check_plain($account->name));
+  drupal_set_title($account->name);
   return drupal_get_form('user_profile_form', $account, $category);
 }