? .project
? modules/.DS_Store
? sites/.DS_Store
? sites/all/themes/.DS_Store
? sites/default/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.503
diff -u -p -r1.503 theme.inc
--- includes/theme.inc	4 Aug 2009 07:04:21 -0000	1.503
+++ includes/theme.inc	7 Aug 2009 17:00:06 -0000
@@ -592,7 +592,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.
  *
@@ -606,8 +606,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)
@@ -628,7 +628,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.749
diff -u -p -r1.749 comment.module
--- modules/comment/comment.module	4 Aug 2009 06:53:48 -0000	1.749
+++ modules/comment/comment.module	7 Aug 2009 17:00:14 -0000
@@ -119,6 +119,7 @@ function comment_theme() {
     ),
     'comment_submitted' => array(
       'arguments' => array('comment' => NULL),
+      'template' => 'comment_submitted',
     ),
   );
 }
@@ -2181,18 +2182,18 @@ function template_preprocess_comment_wra
 }
 
 /**
- * Theme a "Submitted by ..." notice.
+ * Process variables for comment_submitted.tpl.php
  *
- * @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)
-    ));
+ * The $variables array contains the following additional arguments:
+ * - $username
+ * - $datetime
+ *
+ * @see node.tpl.php
+ */
+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.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	7 Aug 2009 17:00:15 -0000
@@ -54,9 +54,7 @@
 
   <h3><?php print $title ?></h3>
 
-  <div class="submitted">
-    <?php print $submitted ?>
-  </div>
+  <?php print $submitted ?>
 
   <div class="content">
     <?php
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	7 Aug 2009 17:00:15 -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.1093
diff -u -p -r1.1093 node.module
--- modules/node/node.module	6 Aug 2009 05:05:59 -0000	1.1093
+++ modules/node/node.module	7 Aug 2009 17:00:20 -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),
@@ -1256,6 +1257,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
@@ -2813,19 +2828,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.19
diff -u -p -r1.19 node.tpl.php
--- modules/node/node.tpl.php	6 Aug 2009 05:05:59 -0000	1.19
+++ modules/node/node.tpl.php	7 Aug 2009 17:00:20 -0000
@@ -74,9 +74,7 @@
 
   <?php if ($submitted || !empty($content['links']['terms'])): ?>
     <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 print 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	7 Aug 2009 17:00:20 -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.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	7 Aug 2009 17:00:21 -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 ($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	7 Aug 2009 17:00:21 -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.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	7 Aug 2009 17:00:21 -0000
@@ -9,9 +9,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
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	7 Aug 2009 17:00:21 -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.23
diff -u -p -r1.23 template.php
--- themes/garland/template.php	28 Jul 2009 10:09:25 -0000	1.23
+++ themes/garland/template.php	7 Aug 2009 17:00:21 -0000
@@ -52,28 +52,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() {