From 770e0d54f9c5b33c4d01b5cefe652b61b132dc0c Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 29 Aug 2009 04:16:15 +0000
Subject: #364470 by stBorchert and JohnAlbin: Made theming of 'Submitted by
 author, on date' easier.

---
 modules/comment/comment.module  | 19 -------------------
 modules/comment/comment.tpl.php |  6 ++++--
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'modules/comment')

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index afdc87d62..e336b90e1 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -148,9 +148,6 @@ function comment_theme() {
       'template' => 'comment-wrapper',
       'arguments' => array('content' => NULL),
     ),
-    'comment_submitted' => array(
-      'arguments' => array('comment' => NULL),
-    ),
   );
 }
 
@@ -2088,7 +2085,6 @@ function template_preprocess_comment(&$variables) {
   $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.
@@ -2169,21 +2165,6 @@ function template_preprocess_comment_wrapper(&$variables) {
   $variables['template_files'][] = 'comment-wrapper-' . $variables['node']->type;
 }
 
-/**
- * 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.
  *
diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php
index abcca9378..cae102f85 100644
--- a/modules/comment/comment.tpl.php
+++ b/modules/comment/comment.tpl.php
@@ -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">
-- 
cgit v1.2.3