Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.529
diff -u -p -r1.529 comment.module
--- modules/comment/comment.module	12 Mar 2007 13:08:02 -0000	1.529
+++ modules/comment/comment.module	24 Mar 2007 23:57:36 -0000
@@ -454,26 +454,9 @@ function comment_nodeapi(&$node, $op, $a
 
 /**
  * Implementation of hook_user().
- *
- * Provides signature customization for the user's comments.
  */
 function comment_user($type, $edit, &$user, $category = NULL) {
-  if ($type == 'form' && $category == 'account') {
-    // when user tries to edit his own data
-    $form['comment_settings'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Comment settings'),
-      '#collapsible' => TRUE,
-      '#weight' => 4);
-    $form['comment_settings']['signature'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Signature'),
-      '#default_value' => $edit['signature'],
-      '#description' => t('Your signature will be publicly displayed at the end of your comments.'));
-
-    return $form;
-  }
-  elseif ($type == 'delete') {
+  if ($type == 'delete') {
     db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $user->uid);
     db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $user->uid);
   }
@@ -647,7 +630,7 @@ function comment_reply($node, $pid = NUL
       // $pid indicates that this is a reply to a comment.
       if ($pid) {
         // load the comment whose cid = $pid
-        if ($comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $pid, COMMENT_PUBLISHED))) {
+        if ($comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $pid, COMMENT_PUBLISHED))) {
           // If that comment exists, make sure that the current comment and the parent comment both
           // belong to the same parent node.
           if ($comment->nid != $node->nid) {
@@ -975,7 +958,7 @@ function comment_render($node, $cid = 0)
     else {
       // Multiple comment view
       $query_count = 'SELECT COUNT(*) FROM {comments} WHERE nid = %d';
-      $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.picture, u.data, c.score, c.users, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';
+      $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.score, c.users, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';
 
       $query_args = array($nid);
       if (!user_access('administer comments')) {
@@ -1538,7 +1521,7 @@ function comment_form($edit, $title = NU
     $form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#maxlength' => 64, '#default_value' => !empty($edit['subject']) ? $edit['subject'] : '');
   }
 
-  $form['comment_filter']['comment'] = array('#type' => 'textarea', '#title' => t('Comment'), '#rows' => 15, '#default_value' => !empty($edit['comment']) ? $edit['comment'] : $user->signature, '#required' => TRUE);
+  $form['comment_filter']['comment'] = array('#type' => 'textarea', '#title' => t('Comment'), '#rows' => 15, '#default_value' => $edit['comment'], '#required' => TRUE);
   if (!isset($edit['format'])) {
     $edit['format'] = FILTER_FORMAT_DEFAULT;
   }
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.760
diff -u -p -r1.760 user.module
--- modules/user/user.module	24 Mar 2007 05:36:30 -0000	1.760
+++ modules/user/user.module	24 Mar 2007 23:57:39 -0000
@@ -1432,6 +1432,21 @@ function user_edit_form($uid, $edit, $re
     }
   }
 
+  // Signature:
+  if (module_exists('comment')) {
+    $form['signature_settings'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Signature settings'),
+      '#weight' => 1,
+    );
+    $form['signature_settings']['signature'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Signature'),
+      '#default_value' => $edit['signature'],
+      '#description' => t('Your signature will be publicly displayed at the end of your comments.'),
+    );
+  }
+
   // Picture/avatar:
   if (variable_get('user_pictures', 0) && !$register) {
     $form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
Index: themes/bluemarine/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/comment.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 comment.tpl.php
--- themes/bluemarine/comment.tpl.php	31 Jan 2007 15:49:26 -0000	1.3
+++ themes/bluemarine/comment.tpl.php	24 Mar 2007 23:57:39 -0000
@@ -4,6 +4,12 @@
   } ?>
 <h3 class="title"><?php print $title; ?></h3><?php if ($new != '') { ?><span class="new"><?php print $new; ?></span><?php } ?>
     <div class="submitted"><?php print $submitted; ?></div>
-    <div class="content"><?php print $content; ?></div>
+    <div class="content">
+     <?php print $content; ?>
+      <div class="user-signature clear">
+        — <br />
+        <?php print $signature; ?>
+      </div>
+    </div>
     <div class="links">&raquo; <?php print $links; ?></div>
   </div>
Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.56
diff -u -p -r1.56 chameleon.theme
--- themes/chameleon/chameleon.theme	29 Nov 2006 06:36:12 -0000	1.56
+++ themes/chameleon/chameleon.theme	24 Mar 2007 23:57:39 -0000
@@ -163,7 +163,12 @@ function chameleon_comment($comment, $li
 
   $output  = "<div class=\"comment". ($comment->status == COMMENT_NOT_PUBLISHED ? ' comment-unpublished' : '') ."\">\n";
   $output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") ."</h3>\n";
-  $output .= " <div class=\"content\">". $comment->comment ."</div>\n";
+  $output .= " <div class=\"content\">". $comment->comment;
+  $output .= "  <div class=\"user-signature clear\">";
+  $output .= "— <br />\n";
+  $output .= $signature ."\n";
+  $output .= "  </div>\n";
+  $output .= " </div>\n";
   $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $links)) ."</div>\n";
   $output .= "</div>\n";
 
Index: themes/engines/phptemplate/phptemplate.engine
===================================================================
RCS file: /cvs/drupal/drupal/themes/engines/phptemplate/phptemplate.engine,v
retrieving revision 1.57
diff -u -p -r1.57 phptemplate.engine
--- themes/engines/phptemplate/phptemplate.engine	15 Feb 2007 11:40:19 -0000	1.57
+++ themes/engines/phptemplate/phptemplate.engine	24 Mar 2007 23:57:40 -0000
@@ -308,6 +308,7 @@ function phptemplate_comment($comment, $
     'date'      => format_date($comment->timestamp),
     'links'     => isset($links) ? theme('links', $links) : '',
     'new'       => $comment->new ? t('new') : '',
+    'signature' => check_markup($comment->signature, $comment->format),
     'picture'   => theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '',
     'submitted' => t('Submitted by !a on @b.',
                       array('!a' => theme('username', $comment),
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 comment.tpl.php
--- themes/garland/comment.tpl.php	31 Jan 2007 15:49:26 -0000	1.4
+++ themes/garland/comment.tpl.php	24 Mar 2007 23:57:40 -0000
@@ -16,6 +16,10 @@
 
     <div class="content">
       <?php print $content ?>
+      <div class="user-signature clear">
+        — <br />
+        <?php print $signature ?>
+      </div>
     </div>
 
   </div>
Index: themes/pushbutton/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/comment.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 comment.tpl.php
--- themes/pushbutton/comment.tpl.php	15 Apr 2006 04:07:18 -0000	1.2
+++ themes/pushbutton/comment.tpl.php	24 Mar 2007 23:57:40 -0000
@@ -4,7 +4,13 @@
   <?php endif; ?>
   <h3 class="title"><?php print $title ?></h3>
   <div class="submitted"><?php print $submitted ?><?php if ($comment->new) : ?><span class="new"> *<?php print $new ?></span><?php endif; ?></div>
-  <div class="content"><?php print $content ?></div>
+  <div class="content">
+    <?php print $content ?>
+    <div class="user-signature clear">
+      — <br />
+      <?php print $signature ?>
+    </div>
+  </div>
   <!-- BEGIN: links -->
   <div class="links">&raquo; <?php print $links ?></div>
   <!-- END: links -->