? .project
? modules/.DS_Store
? sites/all/themes/.DS_Store
? sites/default/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.740
diff -u -p -r1.740 comment.module
--- modules/comment/comment.module	10 Jul 2009 05:50:08 -0000	1.740
+++ modules/comment/comment.module	17 Jul 2009 12:34:18 -0000
@@ -135,6 +135,7 @@ function comment_theme() {
     ),
     'comment_submitted' => array(
       'arguments' => array('comment' => NULL),
+      'template' => 'comment_submitted',
     ),
   );
 }
@@ -2081,18 +2082,18 @@ function template_preprocess_comment_wra
 }
 
 /**
- * Theme a "Submitted by ..." notice.
+ * Process variables for comment_submitted.tpl.php
  *
- * @param $comment
- *   The comment.
- * @ingroup themeable
+ * The $variables array contains the following additional arguments:
+ * - $username
+ * - $datetime
+ *
+ * @see node.tpl.php
  */
-function theme_comment_submitted($comment) {
-  return t('Submitted by !username on @datetime.',
-    array(
-      '!username' => theme('username', $comment),
-      '@datetime' => format_date($comment->timestamp)
-    ));
+function template_preprocess_comment_submitted(&$variables) {
+  $comment = $variables['comment'];
+  $variables['author'] = theme('username', $comment);
+  $variables['date'] = format_date($comment->timestamp);
 }
 
 /**
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.9
diff -u -p -r1.9 comment.tpl.php
--- modules/comment/comment.tpl.php	28 May 2009 16:44:06 -0000	1.9
+++ modules/comment/comment.tpl.php	17 Jul 2009 12:34:18 -0000
@@ -52,9 +52,7 @@
 
   <h3><?php print $title ?></h3>
 
-  <div class="submitted">
-    <?php print $submitted ?>
-  </div>
+  <?php print $submitted ?>
 
   <div class="content">
     <?php print $content ?>
Index: modules/comment/comment_submitted.tpl.php
===================================================================
RCS file: modules/comment/comment_submitted.tpl.php
diff -N modules/comment/comment_submitted.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/comment/comment_submitted.tpl.php	17 Jul 2009 12:34:18 -0000
@@ -0,0 +1,18 @@
+<?php
+// $Id$
+
+/**
+* @file
+* Default theme implementation to present the submitted information for a
+* comment object.
+*
+* Available variables:
+* - $author: Name of the user who submitted the comment.
+* - $date: The timestamp on which the comment has been created.
+*
+* @see template_preprocess_comment_submitted()
+*/
+?>
+<div class="submitted">
+  <?php print t('Submitted by !author on @date', array('!author' => $author, '@date' => $date)); ?>
+</div>
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1082
diff -u -p -r1.1082 node.module
--- modules/node/node.module	10 Jul 2009 05:58:13 -0000	1.1082
+++ modules/node/node.module	17 Jul 2009 12:34:22 -0000
@@ -102,6 +102,7 @@ function node_theme() {
     ),
     'node_submitted' => array(
       'arguments' => array('node' => NULL),
+      'template' => 'node_submitted',
     ),
     'node_admin_overview' => array(
       'arguments' => array('name' => NULL, 'type' => NULL),
@@ -1264,6 +1265,20 @@ function template_preprocess_node(&$vari
 }
 
 /**
+ * Process variables for node_submitted.tpl.php
+ *
+ * The $variables array contains the following additional arguments:
+ * - $author
+ *
+ * @see node_submitted.tpl.php
+ */
+function template_preprocess_node_submitted(&$variables) {
+  $node = $variables['node'];
+  $variables['author'] = theme('username', $node);
+  $variables['date'] = format_date($node->created);
+}
+
+/**
  * Theme a log message.
  *
  * @ingroup themeable
@@ -2816,19 +2831,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.17
diff -u -p -r1.17 node.tpl.php
--- modules/node/node.tpl.php	13 Jul 2009 21:09:54 -0000	1.17
+++ modules/node/node.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -77,9 +77,7 @@
 <?php endif; ?>
 
   <div class="meta">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted ?></span>
-  <?php endif; ?>
+  <?php print $submitted ?>
 
   <?php if (!empty($content['links']['terms'])): ?>
     <div class="terms terms-inline"><?php render($content['links']['terms']) ?></div>
Index: modules/node/node_submitted.tpl.php
===================================================================
RCS file: modules/node/node_submitted.tpl.php
diff -N modules/node/node_submitted.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/node/node_submitted.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -0,0 +1,18 @@
+<?php
+// $Id$
+
+/**
+* @file
+* Default theme implementation to present the submitted information for a
+* node object.
+*
+* Available variables:
+* - $author: Name of the user who submitted the node.
+* - $date: The timestamp on which the node has been created.
+*
+* @see template_preprocess_node_submitted()
+*/
+?>
+<div class="submitted">
+  <?php print t('Submitted by !author on @date', array('!author' => $author, '@date' => $date)); ?>
+</div>
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.13
diff -u -p -r1.13 comment.tpl.php
--- themes/garland/comment.tpl.php	28 May 2009 16:44:07 -0000	1.13
+++ themes/garland/comment.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -4,9 +4,7 @@
 <div class="<?php print $classes . ' ' . $zebra; ?>">
 
   <div class="clearfix">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted; ?></span>
-  <?php endif; ?>
+  <?php print $submitted; ?>
 
   <?php if ($comment->new) : ?>
     <span class="new"><?php print drupal_ucfirst($new) ?></span>
Index: themes/garland/comment_submitted.tpl.php
===================================================================
RCS file: themes/garland/comment_submitted.tpl.php
diff -N themes/garland/comment_submitted.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/garland/comment_submitted.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -0,0 +1,18 @@
+<?php
+// $Id$
+
+/**
+* @file
+* Default theme implementation to present the submitted information for a
+* comment object.
+*
+* Available variables:
+* - $author: Name of the user who submitted the comment.
+* - $date: The timestamp on which the comment has been created.
+*
+* @see template_preprocess_comment_submitted()
+*/
+?>
+<span class="submitted">
+  <?php print t('@date - !author', array('!author' => $author, '@date' => $date)); ?>
+</span>
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.13
diff -u -p -r1.13 node.tpl.php
--- themes/garland/node.tpl.php	14 Jul 2009 10:29:10 -0000	1.13
+++ themes/garland/node.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -8,9 +8,7 @@
   <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 endif; ?>
+  <?php print $submitted; ?>
 
   <div class="content clearfix">
     <?php hide($content['links']); hide($content['comments']); print render($content); ?>
Index: themes/garland/node_submitted.tpl.php
===================================================================
RCS file: themes/garland/node_submitted.tpl.php
diff -N themes/garland/node_submitted.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/garland/node_submitted.tpl.php	17 Jul 2009 12:34:23 -0000
@@ -0,0 +1,18 @@
+<?php
+// $Id$
+
+/**
+* @file
+* Default theme implementation to present the submitted information for a
+* node object.
+*
+* Available variables:
+* - $author: Name of the user who submitted the node.
+* - $date: The timestamp on which the node has been created.
+*
+* @see template_preprocess_node_submitted()
+*/
+?>
+<span class="submitted">
+  <?php print t('@date - !author', array('!author' => $author, '@date' => $date)); ?>
+</span>
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.22
diff -u -p -r1.22 template.php
--- themes/garland/template.php	2 Jun 2009 03:57:22 -0000	1.22
+++ themes/garland/template.php	17 Jul 2009 12:34:23 -0000
@@ -64,28 +64,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() {