Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.926
diff -r1.926 comment.module
1118c1118
<       '#type' => 'select',
---
>       '#type' => 'radios',
1124d1123
<         COMMENT_NODE_HIDDEN => t('Hidden'),
1126,1131c1125,1130
<     );
<     $form['comment']['comment_default_mode'] = array(
<       '#type' => 'checkbox',
<       '#title' => t('Threading'),
<       '#default_value' => variable_get('comment_default_mode_' . $form['#node_type']->type, COMMENT_MODE_THREADED),
<       '#description' => t('Show comment replies in a threaded list.'),
---
>       COMMENT_NODE_OPEN => array(
>         '#description' => t('Users with the "Post comments" permission can post comments.'),
>       ),
>       COMMENT_NODE_CLOSED => array(
>         '#description' => t('Users cannot post comments.'),
>       ),
1139,1148c1138,1141
<     $form['comment']['comment_anonymous'] = array(
<       '#type' => 'select',
<       '#title' => t('Anonymous commenting'),
<       '#default_value' => variable_get('comment_anonymous_' . $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
<       '#options' => array(
<         COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
<         COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
<         COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'),
<       ),
<       '#access' => user_access('post comments', drupal_anonymous_user()),
---
>     $form['comment']['comment_default_mode'] = array(
>       '#type' => 'checkbox',
>       '#title' => t('Show comment replies in a threaded list'),
>       '#default_value' => variable_get('comment_default_mode_' . $form['#node_type']->type, COMMENT_MODE_THREADED),
1159a1153,1163
>     $form['comment']['comment_anonymous'] = array(
>       '#type' => 'select',
>       '#title' => t('Anonymous commenting'),
>       '#default_value' => variable_get('comment_anonymous_' . $form['#node_type']->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT),
>       '#options' => array(
>         COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
>         COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
>         COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'),
>       ),
>       '#access' => user_access('post comments', drupal_anonymous_user()),
>     );
Index: modules/comment/comment-node-form.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment-node-form.js,v
retrieving revision 1.6
diff -r1.6 comment-node-form.js
16c16
<       vals.push($(".form-item-comment select option:selected", context).text());
---
>       vals.push($(".form-item-comment input:checked").parent().find('label').text());