? 363623.patch
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.316
diff -r1.316 blog.module
80c80
<   $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
---
>   $form['body_field'] = node_body_field($node, $type->body_label);
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.64
diff -r1.64 content_types.inc
132,138d131
<   $form['submission']['min_word_count'] = array(
<     '#type' => 'select',
<     '#title' => t('Minimum number of words'),
<     '#default_value' => $type->min_word_count,
<     '#options' => drupal_map_assoc(array(0, 10, 25, 50, 75, 100, 125, 150, 175, 200)),
<     '#description' => t('The minimum number of words for the body field to be considered valid for this content type. This can be useful to rule out submissions that do not meet the site\'s standards, such as short test posts.')
<   );
274d266
<   $type->min_word_count = $form_state['values']['min_word_count'];
Index: modules/node/node.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.api.php,v
retrieving revision 1.10
diff -r1.10 node.api.php
443,444d442
<  *   - "min_word_count": the minimum number of words for the body field to be
<  *      considered valid for this content type. Optional (defaults to 0).
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.11
diff -r1.11 node.install
342,348d341
<       'min_word_count' => array(
<         'description' => 'The minimum number of words the body must contain.',
<         'type' => 'int',
<         'unsigned' => TRUE,
<         'not null' => TRUE,
<         'size' => 'small',
<       ),
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1023
diff -r1.1023 node.module
574d573
<     'min_word_count' => (int) $type->min_word_count,
694d692
<     $type->min_word_count = 0;
975,980d972
<   // Make sure the body has the minimum number of words.
<   // TODO : use a better word counting algorithm that will work in other languages
<   if (!empty($type->min_word_count) && isset($node->body) && count(explode(' ', $node->body)) < $type->min_word_count) {
<     form_set_error('body', t('The body of your @type is too short. You need at least %words words.', array('%words' => $type->min_word_count, '@type' => $type->name)));
<   }
< 
1949c1941
<     
---
> 
2784c2776
<     $form['body_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
---
>     $form['body_field'] = node_body_field($node, $type->body_label);
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.54
diff -r1.54 node.pages.inc
271c271
< function node_body_field(&$node, $label, $word_count) {
---
> function node_body_field(&$node, $label) {
303d302
<     '#required' => ($word_count > 0),
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.83
diff -r1.83 drupal_web_test_case.php
545d544
<       'min_word_count' => 0,
2002c2001
<   
---
> 
2020c2019
<     
---
> 
2023c2022
<     
---
> 
2026c2025
<   
---
> 
2049c2048
<     
---
> 
2052c2051
<     
---
>