Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.907
diff -u -p -r1.907 comment.module
--- modules/comment/comment.module	23 Oct 2010 15:30:34 -0000	1.907
+++ modules/comment/comment.module	2 Nov 2010 17:25:20 -0000
@@ -2029,7 +2029,7 @@ function comment_preview($comment) {
 
     if (!empty($account->uid)) {
       $comment->uid = $account->uid;
-      $comment->name = check_plain($account->name);
+      $comment->name = $account->name;
     }
     elseif (empty($comment->name)) {
       $comment->name = variable_get('anonymous', t('Anonymous'));
@@ -2229,6 +2229,7 @@ function template_preprocess_comment(&$v
 
   $variables['title']     = l($comment->subject, $uri['path'], $uri['options']);
   $variables['permalink'] = l(t('Permalink'), $uri['path'], $uri['options']);
+  $variables['submitted'] = t('Submitted by !username on !datetime.', array('!username' => $variables['author'], '!datetime' => $variables['created']));
 
   // Preprocess fields.
   field_attach_preprocess('comment', $comment, $variables['elements'], $variables);
Index: modules/comment/comment.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tokens.inc,v
retrieving revision 1.13
diff -u -p -r1.13 comment.tokens.inc
--- modules/comment/comment.tokens.inc	7 Jul 2010 17:00:42 -0000	1.13
+++ modules/comment/comment.tokens.inc	2 Nov 2010 17:25:20 -0000
@@ -132,12 +132,21 @@ function comment_tokens($type, $tokens, 
           break;
 
         case 'name':
-          $name = ($comment->uid == 0) ? variable_get('anonymous', t('Anonymous')) : $comment->name;
+        case 'author':
+          $name = $comment->name;
+          if ($comment->uid) {
+            // Registered users always have their name displayed.
+            $account = user_load($comment->uid);
+            $name = format_username($account);
+          }
+          elseif (!$comment->name) {
+            $name = variable_get('anonymous', t('Anonymous'));
+          }
           $replacements[$original] = $sanitize ? filter_xss($name) : $name;
           break;
 
         case 'mail':
-          if ($comment->uid != 0) {
+          if ($comment->uid) {
             $account = user_load($comment->uid);
             $mail = $account->mail;
           }
@@ -173,10 +182,6 @@ function comment_tokens($type, $tokens, 
           break;
 
         // Default values for the chained tokens handled below.
-        case 'author':
-          $replacements[$original] = $sanitize ? filter_xss($comment->name) : $comment->name;
-          break;
-
         case 'parent':
           if (!empty($comment->pid)) {
             $parent = comment_load($comment->pid);
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.18
diff -u -p -r1.18 comment.tpl.php
--- modules/comment/comment.tpl.php	7 Jan 2010 05:23:51 -0000	1.18
+++ modules/comment/comment.tpl.php	2 Nov 2010 17:25:20 -0000
@@ -19,6 +19,7 @@
  *   desired parameters on the $comment->changed variable.
  * - $new: New comment marker.
  * - $permalink: Comment permalink.
+ * - $submitted: Themed submission information.
  * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
@@ -70,8 +71,8 @@
   <div class="submitted">
     <?php print $permalink; ?>
     <?php
-      print t('Submitted by !username on !datetime.',
-        array('!username' => $author, '!datetime' => $created));
+      if ($submitted):
+        print $submitted;
     ?>
   </div>
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1312
diff -u -p -r1.1312 node.module
--- modules/node/node.module	23 Oct 2010 18:25:05 -0000	1.1312
+++ modules/node/node.module	2 Nov 2010 17:25:20 -0000
@@ -172,6 +172,8 @@ function node_entity_info() {
       'base table' => 'node',
       'revision table' => 'node_revision',
       'uri callback' => 'node_uri',
+      'path' => 'node/%node',
+      'token path' => 'node/[node:nid]',
       'fieldable' => TRUE,
       'entity keys' => array(
         'id' => 'nid',
@@ -1426,11 +1428,11 @@ function template_preprocess_node(&$vari
 
   // Display post information only on certain node types.
   if (variable_get('node_submitted_' . $node->type, TRUE)) {
-    $variables['display_submitted'] = TRUE;
+    $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date']));
     $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
   }
   else {
-    $variables['display_submitted'] = FALSE;
+    $variables['submitted'] = FALSE;
     $variables['user_picture'] = '';
   }
 
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.33
diff -u -p -r1.33 node.tpl.php
--- modules/node/node.tpl.php	8 Apr 2010 18:26:42 -0000	1.33
+++ modules/node/node.tpl.php	2 Nov 2010 17:25:20 -0000
@@ -16,7 +16,7 @@
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
- * - $display_submitted: whether submission information should be displayed.
+ * - $submitted: Themed submission information.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
  *   preprocess functions. The default values can be one or more of the
@@ -87,12 +87,9 @@
   <?php endif; ?>
   <?php print render($title_suffix); ?>
 
-  <?php if ($display_submitted): ?>
+  <?php if ($submitted): ?>
     <div class="submitted">
-      <?php
-        print t('Submitted by !username on !datetime',
-          array('!username' => $name, '!datetime' => $date));
-      ?>
+      <?php print $submitted; ?>
     </div>
   <?php endif; ?>
 
Index: themes/bartik/templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/node.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 node.tpl.php
--- themes/bartik/templates/node.tpl.php	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/templates/node.tpl.php	2 Nov 2010 17:25:20 -0000
@@ -16,7 +16,7 @@
  *   calling format_date() with the desired parameters on the $created variable.
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
- * - $display_submitted: whether submission information should be displayed.
+ * - $submitted: Themed submission information.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
  *   preprocess functions. The default values can be one or more of the
@@ -87,13 +87,10 @@
   <?php endif; ?>
   <?php print render($title_suffix); ?>
 
-  <?php if ($display_submitted): ?>
+  <?php if ($submitted): ?>
     <div class="meta submitted">
       <?php print $user_picture; ?>
-      <?php
-        print t('published by !username on !datetime',
-          array('!username' => $name, '!datetime' => $date));
-      ?>
+      <?php print $submitted; ?>
     </div>
   <?php endif; ?>
 
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.20
diff -u -p -r1.20 comment.tpl.php
--- themes/garland/comment.tpl.php	4 Jan 2010 03:57:19 -0000	1.20
+++ themes/garland/comment.tpl.php	2 Nov 2010 17:25:20 -0000
@@ -5,7 +5,9 @@
 
   <div class="clearfix">
 
-    <span class="submitted"><?php print $created; ?> — <?php print $author; ?></span>
+  <?php if ($submitted): ?>
+    <span class="submitted"><?php print $submitted ?></span>
+  <?php endif; ?>
 
   <?php if ($new) : ?>
     <span class="new"><?php print drupal_ucfirst($new) ?></span>
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.23
diff -u -p -r1.23 node.tpl.php
--- themes/garland/node.tpl.php	8 Apr 2010 18:26:42 -0000	1.23
+++ themes/garland/node.tpl.php	2 Nov 2010 17:25:20 -0000
@@ -11,8 +11,8 @@
   <?php endif; ?>
   <?php print render($title_suffix); ?>
 
-  <?php if ($display_submitted): ?>
-    <span class="submitted"><?php print $date; ?> — <?php print $name; ?></span>
+  <?php if ($submitted): ?>
+    <span class="submitted"><?php print $submitted ?></span>
   <?php endif; ?>
 
   <div class="content clearfix"<?php print $content_attributes; ?>>