#364470 by stBorchert and JohnAlbin: Made theming of 'Submitted by author, on date' easier.

3 files changed, 4 insertions, 27 deletions

diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index c9daefc00..d664d2360 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -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>
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 935d62730..9895917d1 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -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">
diff --git a/themes/garland/template.php b/themes/garland/template.php
index c8b170d9e..5b9790ce0 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -80,28 +80,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() {