Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.514
diff -u -p -r1.514 theme.inc
--- includes/theme.inc	24 Aug 2009 00:34:11 -0000	1.514
+++ includes/theme.inc	25 Aug 2009 12:53:30 -0000
@@ -610,7 +610,7 @@ function list_themes($refresh = FALSE) {
  * - MODULE_preprocess_HOOK(&$variables)
  *   This is for modules that want to alter or provide extra variables for
  *   theming hooks not registered to itself. For example, if a module named
- *   "foo" wanted to alter the $submitted variable for the hook "node" a
+ *   "foo" wanted to alter the $classes_array variable for the hook "node" a
  *   preprocess function of foo_preprocess_node() can be created to intercept
  *   and alter the variable.
  *
@@ -624,8 +624,8 @@ function list_themes($refresh = FALSE) {
  *
  * - THEME_preprocess(&$variables)
  *   This is for themes that want to alter or provide extra variables. For
- *   example, if a theme named "foo" wanted to alter the $submitted variable for
- *   the hook "node" a preprocess function of foo_preprocess_node() can be
+ *   example, if a theme named "foo" wanted to alter the $classes_array variable
+ *   for the hook "node" a preprocess function of foo_preprocess_node() can be
  *   created to intercept and alter the variable.
  *
  * - THEME_preprocess_HOOK(&$variables)
@@ -646,7 +646,7 @@ function list_themes($refresh = FALSE) {
  * - MODULE_process_HOOK(&$variables)
  *   This is for modules that want to alter or provide extra variables for
  *   theming hooks not registered to itself. For example, if a module named
- *   "foo" wanted to alter the $submitted variable for the hook "node" a
+ *   "foo" wanted to alter the $classes_array variable for the hook "node" a
  *   process function of foo_process_node() can be created to intercept
  *   and alter the variable.
  *
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.760
diff -u -p -r1.760 comment.module
--- modules/comment/comment.module	25 Aug 2009 10:41:22 -0000	1.760
+++ modules/comment/comment.module	25 Aug 2009 12:53:30 -0000
@@ -117,9 +117,6 @@ function comment_theme() {
       'template' => 'comment-wrapper',
       'arguments' => array('content' => NULL),
     ),
-    'comment_submitted' => array(
-      'arguments' => array('comment' => NULL),
-    ),
   );
 }
 
@@ -2093,7 +2090,6 @@ function template_preprocess_comment(&$v
   $variables['new']       = !empty($comment->new) ? t('new') : '';
   $variables['picture']   = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '';
   $variables['signature'] = $comment->signature;
-  $variables['submitted'] = theme('comment_submitted', $comment);
   $variables['title']     = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
   $variables['template_files'][] = 'comment-' . $variables['node']->type;
   // Set status to a string representation of comment->status.
@@ -2175,21 +2171,6 @@ function template_preprocess_comment_wra
 }
 
 /**
- * Theme a "Submitted by ..." notice.
- *
- * @param $comment
- *   The comment.
- * @ingroup themeable
- */
-function theme_comment_submitted($comment) {
-  return t('Submitted by !username on @datetime.',
-    array(
-      '!username' => theme('username', $comment),
-      '@datetime' => format_date($comment->timestamp)
-    ));
-}
-
-/**
  * Return an array of viewing modes for comment listings.
  *
  * We can't use a global variable array because the locale system
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.10
diff -u -p -r1.10 comment.tpl.php
--- modules/comment/comment.tpl.php	28 Jul 2009 10:09:25 -0000	1.10
+++ modules/comment/comment.tpl.php	25 Aug 2009 12:53:30 -0000
@@ -17,7 +17,6 @@
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
  *   comment-unpublished, comment-published or comment-preview.
- * - $submitted: By line with date and time.
  * - $title: Linked title.
  * - $classes: String of classes that can be used to style contextually through
  *   CSS. It can be manipulated through the variable $classes_array from
@@ -55,7 +54,10 @@
   <h3><?php print $title ?></h3>
 
   <div class="submitted">
-    <?php print $submitted ?>
+    <?php
+      print t('Submitted by !username on @datetime.',
+        array('!username' => $author, '@datetime' => $date));
+    ?>
   </div>
 
   <div class="content">
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1111
diff -u -p -r1.1111 node.module
--- modules/node/node.module	25 Aug 2009 02:48:16 -0000	1.1111
+++ modules/node/node.module	25 Aug 2009 12:53:31 -0000
@@ -128,9 +128,6 @@ function node_theme() {
     'node_log_message' => array(
       'arguments' => array('log' => NULL),
     ),
-    'node_submitted' => array(
-      'arguments' => array('node' => NULL),
-    ),
     'node_admin_overview' => array(
       'arguments' => array('name' => NULL, 'type' => NULL),
     ),
@@ -1280,11 +1277,11 @@ function template_preprocess_node(&$vari
 
   // Display post information only on certain node types.
   if (variable_get('node_submitted_' . $node->type, TRUE)) {
-    $variables['submitted'] = theme('node_submitted', $node);
+    $variables['display_submitted'] = TRUE;
     $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
   }
   else {
-    $variables['submitted'] = '';
+    $variables['display_submitted'] = FALSE;
     $variables['user_picture'] = '';
   }
 
@@ -2946,19 +2943,6 @@ function node_forms() {
 }
 
 /**
- * Format the "Submitted by username on date/time" for each node
- *
- * @ingroup themeable
- */
-function theme_node_submitted($node) {
-  return t('Submitted by !username on @datetime',
-    array(
-      '!username' => theme('username', $node),
-      '@datetime' => format_date($node->created),
-    ));
-}
-
-/**
  * Implement hook_hook_info().
  */
 function node_hook_info() {
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.20
diff -u -p -r1.20 node.tpl.php
--- modules/node/node.tpl.php	22 Aug 2009 00:58:54 -0000	1.20
+++ modules/node/node.tpl.php	25 Aug 2009 12:53:31 -0000
@@ -17,8 +17,7 @@
  * - $name: Themed username of node author output from theme_username().
  * - $node_url: Direct url of the current node.
  * - $terms: the themed list of taxonomy term links output from theme_links().
- * - $submitted: themed submission information output from
- *   theme_node_submitted().
+ * - $display_submitted: whether submission information should be displayed.
  * - $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 following:
@@ -79,10 +78,15 @@
     <h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
 
-  <?php if ($submitted || !empty($content['links']['terms'])): ?>
+  <?php if ($display_submitted || !empty($content['links']['terms'])): ?>
     <div class="meta">
-      <?php if ($submitted): ?>
-        <span class="submitted"><?php print $submitted; ?></span>
+      <?php if ($display_submitted): ?>
+        <span class="submitted">
+          <?php
+            print t('Submitted by !username on @datetime',
+              array('!username' => $name, '@datetime' => $date));
+          ?>
+        </span>
       <?php endif; ?>
 
       <?php if (!empty($content['links']['terms'])): ?>
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.14
diff -u -p -r1.14 comment.tpl.php
--- themes/garland/comment.tpl.php	28 Jul 2009 10:09:25 -0000	1.14
+++ themes/garland/comment.tpl.php	25 Aug 2009 12:53:31 -0000
@@ -4,9 +4,8 @@
 <div class="<?php print $classes . ' ' . $zebra; ?>">
 
   <div class="clearfix">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted; ?></span>
-  <?php endif; ?>
+
+    <span class="submitted"><?php print $date; ?> — <?php print $author; ?></span>
 
   <?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.14
diff -u -p -r1.14 node.tpl.php
--- themes/garland/node.tpl.php	6 Aug 2009 05:06:00 -0000	1.14
+++ themes/garland/node.tpl.php	25 Aug 2009 12:53:31 -0000
@@ -9,8 +9,8 @@
     <h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
 
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted; ?></span>
+  <?php if ($display_submitted): ?>
+    <span class="submitted"><?php print $date; ?> — <?php print $name; ?></span>
   <?php endif; ?>
 
   <div class="content clearfix">
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.26
diff -u -p -r1.26 template.php
--- themes/garland/template.php	22 Aug 2009 14:34:23 -0000	1.26
+++ themes/garland/template.php	25 Aug 2009 12:53:31 -0000
@@ -56,28 +56,6 @@ function garland_menu_local_tasks() {
 }
 
 /**
- * Format the "Submitted by username on date/time" for each comment.
- */
-function garland_comment_submitted($comment) {
-  return t('!datetime — !username',
-    array(
-      '!username' => theme('username', $comment),
-      '!datetime' => format_date($comment->timestamp)
-    ));
-}
-
-/**
- * Format the "Submitted by username on date/time" for each node.
- */
-function garland_node_submitted($node) {
-  return t('!datetime — !username',
-    array(
-      '!username' => theme('username', $node),
-      '!datetime' => format_date($node->created),
-    ));
-}
-
-/**
  * Generates IE CSS links for LTR and RTL languages.
  */
 function garland_get_ie_styles() {