Index: node-comment.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodecomment/node-comment.tpl.php,v
retrieving revision 1.1.4.1.2.5
diff -u -r1.1.4.1.2.5 node-comment.tpl.php
--- node-comment.tpl.php 17 Jun 2009 19:50:33 -0000 1.1.4.1.2.5
+++ node-comment.tpl.php 28 Jan 2010 16:48:55 -0000
@@ -28,6 +28,11 @@
Index: nodecomment.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodecomment/nodecomment.module,v
retrieving revision 1.3.2.15.2.17.2.40
diff -u -r1.3.2.15.2.17.2.40 nodecomment.module
--- nodecomment.module 2 Nov 2009 04:47:24 -0000 1.3.2.15.2.17.2.40
+++ nodecomment.module 28 Jan 2010 16:48:55 -0000
@@ -122,6 +122,7 @@
$query = array('page' => $pagenum);
}
$vars['comment_link'] = l($node->title, 'node/'. $node->comment_target_nid, array('query' => $query, 'fragment' => 'comment-' . $node->nid));
+ $vars['signature'] = !empty($node->signature) ? theme('user_signature', $node->signature) : '';
}
}
@@ -529,7 +530,7 @@
switch ($op) {
case 'load':
$node->comment_type = nodecomment_get_comment_type($node->type);
- $comment_data = db_fetch_array(db_query('SELECT * FROM {node_comments} nc WHERE nc.cid = %d', $node->nid));
+ $comment_data = db_fetch_array(db_query('SELECT nc.*, u.signature, u.signature_format FROM {node_comments} nc INNER JOIN {users} u ON nc.uid=u.uid WHERE nc.cid = %d', $node->nid));
if ($comment_data['cid']) {
// It's a node comment! Populate commenty stuff.
$comment_data['comment_target_nid'] = $comment_data['nid'];
@@ -542,6 +543,13 @@
if (!empty($node->uid)) {
unset($comment_data['name']);
}
+ // Add the user signature like comment.module does
+ if (variable_get('user_signatures', 0) && !empty($comment_data['signature'])) {
+ $comment_data['signature'] = check_markup($comment_data['signature'], $comment_data['signature_format'], FALSE);
+ }
+ else {
+ $comment_data['signature'] = '';
+ }
return $comment_data;
}
else if ($node->comment_type) {