diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-23 06:02:06 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-23 06:02:06 +0000 |
| commit | 57d6dac0dc27204461f714ec5a93462ccdfe0b6b (patch) | |
| tree | 1db91ef6e960dd5f68d851c4c7feb891420365a6 /modules/comment/comment.module | |
| parent | 6cacff4b4e4494c05f90604849dc8803c7506ae0 (diff) | |
| download | brdo-57d6dac0dc27204461f714ec5a93462ccdfe0b6b.tar.gz brdo-57d6dac0dc27204461f714ec5a93462ccdfe0b6b.tar.bz2 | |
#867956 follow-up by sun: Clean-ups to previous patch
Diffstat (limited to 'modules/comment/comment.module')
| -rw-r--r-- | modules/comment/comment.module | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module index f5d9f0f5e..aa7f2ad47 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1110,11 +1110,18 @@ function comment_form_node_type_form_alter(&$form, $form_state) { 'js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'), ), ); + // Unlike coment_form_node_form_alter(), all of these settings are applied + // as defaults to all new nodes. Therefore, it would be wrong to use #states + // to hide the other settings based on the primary comment setting. $form['comment']['comment'] = array( '#type' => 'select', '#title' => t('Default comment setting for new content'), '#default_value' => variable_get('comment_' . $form['#node_type']->type, COMMENT_NODE_OPEN), - '#options' => array(t('Hidden'), t('Closed'), t('Open')), + '#options' => array( + COMMENT_NODE_OPEN => t('Open'), + COMMENT_NODE_CLOSED => t('Closed'), + COMMENT_NODE_HIDDEN => t('Hidden'), + ), ); $form['comment']['comment_default_mode'] = array( '#type' => 'checkbox', @@ -1135,13 +1142,10 @@ function comment_form_node_type_form_alter(&$form, $form_state) { '#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')) + COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'), + ), + '#access' => user_access('post comments', drupal_anonymous_user()), ); - - if (!user_access('post comments', drupal_anonymous_user())) { - $form['comment']['comment_anonymous']['#access'] = FALSE; - } - $form['comment']['comment_subject_field'] = array( '#type' => 'checkbox', '#title' => t('Allow comment title'), |