From 3fad92fc59464454d56f331487f99c474c23e0ec Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Thu, 20 Oct 2005 09:27:36 +0000
Subject: - #34645: Make $links in theme_comment consistent with theme_node
 (Stefan)

---
 modules/comment/comment.module | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules/comment/comment.module')

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 8f90417cc..0b4aeb3c0 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -762,7 +762,7 @@ function comment_render($node, $cid = 0) {
 
       if ($comment = db_fetch_object($result)) {
         $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
-        $output .= theme('comment_view', $comment, theme('links', module_invoke_all('link', 'comment', $comment, 1)));
+        $output .= theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 1));
       }
     }
     else {
@@ -1226,12 +1226,12 @@ function theme_comment_controls($form) {
 }
 
 function theme_comment($comment, $links = 0) {
-  $output  = "<div class=\"comment\">\n";
+  $output  = '<div class="comment">';
   $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") . ' ' . theme('mark', $comment->new) ."</div>\n";
   $output .= '<div class="credit">'. t('by %a on %b', array('%a' => theme('username', $comment), '%b' => format_date($comment->timestamp))) ."</div>\n";
-  $output .= "<div class=\"body\">$comment->comment</div>\n";
-  $output .= "<div class=\"links\">$links</div>\n";
-  $output .= "</div>\n";
+  $output .= '<div class="body">'. $comment->comment .'</div>';
+  $output .= '<div class="links">'. theme('links', $links) .'</div>';
+  $output .= '</div>';
   return $output;
 }
 
@@ -1249,7 +1249,7 @@ function theme_comment_flat_collapsed($comment) {
 }
 
 function theme_comment_flat_expanded($comment) {
-  return theme('comment_view', $comment, theme('links', module_invoke_all('link', 'comment', $comment, 0)));
+  return theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0));
 }
 
 function theme_comment_thread_min($comment, $pid = 0) {
@@ -1265,7 +1265,7 @@ function theme_comment_thread_max($comment, $level = 0) {
     $output .= '<div style="margin-left:'. ($comment->depth * 25) ."px;\">\n";
   }
 
-  $output .= theme('comment_view', $comment, theme('links', module_invoke_all('link', 'comment', $comment, 0)));
+  $output .= theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0));
 
   if ($comment->depth) {
     $output .= "</div>\n";
-- 
cgit v1.2.3