diff --git a/modules/book/book.install b/modules/book/book.install index ae324191b1300fd0c91f3f5840be1bbbc472597a..bf932bba66747ee8d18674750ecb7fb4d6878020 100644 --- a/modules/book/book.install +++ b/modules/book/book.install @@ -37,6 +37,7 @@ function _book_install_type_create() { $book_node_type = node_type_set_defaults($book_node_type); node_type_save($book_node_type); + node_add_body_field($book_node_type); // Default to not promoted. variable_set('node_options_book', array('status')); // Use this default type for adding content to books. diff --git a/modules/forum/forum.install b/modules/forum/forum.install index 65841a4a165a6f43df701826b739bbf06ccac6f6..d23725164a61b47ff9275675ae03adceed7798a7 100644 --- a/modules/forum/forum.install +++ b/modules/forum/forum.install @@ -80,6 +80,10 @@ function forum_enable() { $term = (object) $edit; taxonomy_term_save($term); } + // Ensure the forum node type is available. + node_types_rebuild(); + $types = node_type_get_types(); + node_add_body_field($types['forum']); } /** diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index f3f7acfeab710ddd442a2b0f459d2ff3fc1845c1..812d68032570e5aeeda53845d761b91eb96a386d 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -160,12 +160,6 @@ function node_type_form($form, &$form_state, $type = NULL) { $form['submission']['title_label']['#description'] = t('This content type does not have a title field.'); $form['submission']['title_label']['#required'] = FALSE; } - $form['submission']['body_label'] = array( - '#title' => t('Body field label'), - '#type' => 'textfield', - '#default_value' => isset($type->body_label) ? $type->body_label : '', - '#description' => t('To remove the body field, remove text and leave blank.'), - ); $form['submission']['node_preview'] = array( '#type' => 'radios', '#title' => t('Preview before submitting'), @@ -322,12 +316,9 @@ function node_type_form_submit($form, &$form_state) { $type->description = $form_state['values']['description']; $type->help = $form_state['values']['help']; $type->title_label = $form_state['values']['title_label']; - $type->body_label = $form_state['values']['body_label']; - // title_label is required in core; has_title will always be true, unless a // module alters the title field. $type->has_title = ($type->title_label != ''); - $type->has_body = ($type->body_label != ''); $type->base = !empty($form_state['values']['base']) ? $form_state['values']['base'] : 'node_content'; $type->custom = $form_state['values']['custom']; @@ -372,6 +363,7 @@ function node_type_form_submit($form, &$form_state) { node_types_rebuild(); menu_rebuild(); + node_add_body_field($type); $t_args = array('%name' => $type->name); if ($status == SAVED_UPDATED) { diff --git a/modules/node/content_types.js b/modules/node/content_types.js index a76240c78f287d8971c76fa78242c476717bda27..dfbd01cbf006cff90bfca84596d89a08bb0330ce 100644 --- a/modules/node/content_types.js +++ b/modules/node/content_types.js @@ -7,7 +7,6 @@ Drupal.behaviors.contentTypes = { $('fieldset#edit-submission', context).drupalSetSummary(function(context) { var vals = []; vals.push(Drupal.checkPlain($('#edit-title-label', context).val()) || Drupal.t('Requires a title')); - vals.push(Drupal.checkPlain($('#edit-body-label', context).val()) || Drupal.t('No body')); return vals.join(', '); }); $('fieldset#edit-workflow', context).drupalSetSummary(function(context) { diff --git a/modules/node/node.api.php b/modules/node/node.api.php index 76ac111f700687be3f0ed0b7d2dae85227d273c8..d340d237e114f6c38fe5e16c534c25e334c1a133 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -771,10 +771,6 @@ function hook_node_view_alter(&$build) { * field. Optional (defaults to TRUE). * - "title_label": the label for the title field of this content type. * Optional (defaults to 'Title'). - * - "has_body": boolean indicating whether or not this node type has a body - * field. Optional (defaults to TRUE). - * - "body_label": the label for the body field of this content type. Optional - * (defaults to 'Body'). * - "locked": boolean indicating whether the administrator can change the * machine name of this type. FALSE = changeable (not locked), * TRUE = unchangeable (locked). Optional (defaults to TRUE). @@ -986,17 +982,6 @@ function hook_prepare($node) { function hook_form($node, $form_state) { $type = node_type_get_type($node); - $form['title'] = array( - '#type' => 'textfield', - '#title' => check_plain($type->title_label), - '#required' => TRUE, - ); - $form['body'] = array( - '#type' => 'textarea', - '#title' => check_plain($type->body_label), - '#rows' => 20, - '#required' => TRUE, - ); $form['field1'] = array( '#type' => 'textfield', '#title' => t('Custom field'), diff --git a/modules/node/node.install b/modules/node/node.install index 96b6d7531b65aae2a0853e870e931639c7e31f73..6b8804179abfff18936bbb0d664a83e4f1f2308a 100644 --- a/modules/node/node.install +++ b/modules/node/node.install @@ -306,21 +306,6 @@ function node_schema() { 'default' => '', 'translatable' => TRUE, ), - 'has_body' => array( - 'description' => 'Boolean indicating whether this type has the body field attached.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'size' => 'tiny', - ), - 'body_label' => array( - 'description' => 'The label displayed for the body field on the edit form.', - 'type' => 'varchar', - 'length' => 255, - 'not null' => TRUE, - 'default' => '', - 'translatable' => TRUE, - ), 'custom' => array( 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via Add content type (TRUE).', 'type' => 'int', @@ -552,7 +537,7 @@ function node_update_7006(&$sandbox) { foreach ($revisions as $revision) { $found = TRUE; - if ($node_types[$revision->type]->has_body) { + if ($sandbox['node_types_info'][$revision->type]['has_body']) { $node = (object) array( 'nid' => $revision->nid, 'vid' => $revision->vid, diff --git a/modules/node/node.module b/modules/node/node.module index f2e566ddd29b2c5f47cbe92fe51107d0784ae294..0818b61529dabf00c1f92d85e34f39bf61c90806 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -496,8 +496,6 @@ function node_type_save($info) { 'base' => (string) $type->base, 'has_title' => (int) $type->has_title, 'title_label' => (string) $type->title_label, - 'has_body' => (int) $type->has_body, - 'body_label' => (string) $type->body_label, 'description' => (string) $type->description, 'help' => (string) $type->help, 'custom' => (int) $type->custom, @@ -514,7 +512,6 @@ function node_type_save($info) { if (!empty($type->old_type) && $type->old_type != $type->type) { field_attach_rename_bundle('node', $type->old_type, $type->type); } - node_configure_fields($type); module_invoke_all('node_type_update', $type); $status = SAVED_UPDATED; } @@ -525,7 +522,7 @@ function node_type_save($info) { ->execute(); field_attach_create_bundle('node', $type->type); - node_configure_fields($type); + module_invoke_all('node_type_insert', $type); $status = SAVED_NEW; } @@ -537,60 +534,48 @@ function node_type_save($info) { } /** - * Manage the field(s) for a node type. + * Add default body field to a node type. * - * Currently, the node module manages a single Field API field, - * 'body'. If $type->has_body is true, this function ensures the - * 'body' field exists and creates an instance of it for the bundle - * $type->type (e.g. 'page', 'story', ...). If $type->has_body is - * false, this function removes the instance (if it exists) for the - * 'body' field on $type->type. + * @param $type + * The node type name. + * @param $label + * The label for the body instance. */ -function node_configure_fields($type) { +function node_add_body_field($type, $label = 'Body') { // Add or remove the body field, as needed. $field = field_info_field('body'); $instance = field_info_instance('node', 'body', $type->type); - if ($type->has_body) { - if (empty($field)) { - $field = array( - 'field_name' => 'body', - 'type' => 'text_with_summary', - 'entity_types' => array('node'), - 'translatable' => TRUE, - ); - $field = field_create_field($field); - } - if (empty($instance)) { - $instance = array( - 'field_name' => 'body', - 'entity_type' => 'node', - 'bundle' => $type->type, - 'label' => $type->body_label, - 'widget_type' => 'text_textarea_with_summary', - 'settings' => array('display_summary' => TRUE), - - // Define default formatters for the teaser and full view. - 'display' => array( - 'full' => array( - 'label' => 'hidden', - 'type' => 'text_default', - ), - 'teaser' => array( - 'label' => 'hidden', - 'type' => 'text_summary_or_trimmed', - ), + if (empty($field)) { + $field = array( + 'field_name' => 'body', + 'type' => 'text_with_summary', + 'entity_types' => array('node'), + 'translatable' => TRUE, + ); + $field = field_create_field($field); + } + if (empty($instance)) { + $instance = array( + 'field_name' => 'body', + 'entity_type' => 'node', + 'bundle' => $type->type, + 'label' => $label, + 'widget_type' => 'text_textarea_with_summary', + 'settings' => array('display_summary' => TRUE), + + // Define default formatters for the teaser and full view. + 'display' => array( + 'full' => array( + 'label' => 'hidden', + 'type' => 'text_default', ), - ); - field_create_instance($instance); - } - else { - $instance['label'] = $type->body_label; - $instance['settings']['display_summary'] = TRUE; - field_update_instance($instance); - } - } - elseif (!empty($instance)) { - field_delete_instance($instance); + 'teaser' => array( + 'label' => 'hidden', + 'type' => 'text_summary_or_trimmed', + ), + ), + ); + field_create_instance($instance); } } @@ -737,14 +722,13 @@ function node_type_set_defaults($info = array()) { $type->base = ''; $type->description = ''; $type->help = ''; - $type->has_title = 1; - $type->has_body = 1; - $type->title_label = t('Title'); - $type->body_label = t('Body'); $type->custom = 0; $type->modified = 0; $type->locked = 1; $type->is_new = 1; + + $type->has_title = 1; + $type->title_label = 'Title'; } $new_type = clone $type; @@ -752,13 +736,10 @@ function node_type_set_defaults($info = array()) { foreach ($info as $key => $data) { $new_type->$key = $data; } - // If the type has no title or body, set an empty label. + // If the type has no title, set an empty label. if (!$new_type->has_title) { $new_type->title_label = ''; } - if (!$new_type->has_body) { - $new_type->body_label = ''; - } $new_type->orig_type = isset($info['type']) ? $info['type'] : ''; return $new_type; diff --git a/modules/node/node.test b/modules/node/node.test index cc73a3797205d775b7b7741f583f1de6d0e2293a..4697a7202f1d3d9b7532b0b21e88386e4b3c1d3b 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -1087,39 +1087,33 @@ class NodeTypeTestCase extends DrupalWebTestCase { $this->assertRaw('Title', t('Title field was found.')); $this->assertRaw('Body', t('Body field was found.')); - // Rename the title field and remove the body field. + // Rename the title field. $edit = array( 'title_label' => 'Foo', - 'body_label' => '', ); $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); + // Refresh the field information for the rest of the test. field_info_cache_clear(); - $this->assertFalse(field_info_instance('node', 'body', 'page'), t('Body field was removed.')); $this->drupalGet('node/add/page'); $this->assertRaw('Foo', t('New title label was displayed.')); $this->assertNoRaw('Title', t('Old title label was not displayed.')); - $this->assertNoRaw('Full text', t('Body field was not found.')); - // Add the body field again and change the name, machine name and description. + // Change the name, machine name and description. $edit = array( 'name' => 'Bar', 'type' => 'bar', 'description' => 'Lorem ipsum.', - 'body_label' => 'Baz', ); $this->drupalPost('admin/structure/types/manage/page', $edit, t('Save content type')); - field_info_cache_clear(); - $instance = field_info_instance('node', 'body', 'bar'); - $this->assertEqual($instance['label'], 'Baz', t('Body field was added.')); $this->drupalGet('node/add'); $this->assertRaw('Bar', t('New name was displayed.')); $this->assertRaw('Lorem ipsum', t('New description was displayed.')); $this->clickLink('Bar'); $this->assertEqual(url('node/add/bar', array('absolute' => TRUE)), $this->getUrl(), t('New machine name was used in URL.')); $this->assertRaw('Foo', t('Title field was found.')); - $this->assertRaw('Baz', t('Body field was found.')); + $this->assertRaw('Body', t('Body field was found.')); } } diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 4765508cc97ff3733765897d6d7376d3f1176f0a..d7d95869b7dfaae8cb0274bdec2b4fb819800ac3 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -842,6 +842,7 @@ protected function drupalCreateContentType($settings = array()) { $saved_type = node_type_save($type); node_types_rebuild(); menu_rebuild(); + node_add_body_field($type); $this->assertEqual($saved_type, SAVED_NEW, t('Created content type %type.', array('%type' => $type->type))); diff --git a/modules/user/user.install b/modules/user/user.install index ea30a1eb97184235262f965b38e2b72ea3db3cc2..aef0f9fb9427bb8b18cfa3056ec37ac92a5cf9ec 100644 --- a/modules/user/user.install +++ b/modules/user/user.install @@ -483,7 +483,7 @@ function user_update_7004(&$sandbox) { 'type' => 'int', 'not null' => TRUE, 'default' => 0, - 'description' => t("Foreign key: {file_managed}.fid of user's picture."), + 'description' => "Foreign key: {file_managed}.fid of user's picture.", ); if (!isset($sandbox['progress'])) { diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install index f22b0a7d0b2086d4586135cc5b48aa65dd9c063c..4857f9a98f9e98cc88313e1e4eabf687d498b02c 100644 --- a/profiles/standard/standard.install +++ b/profiles/standard/standard.install @@ -227,6 +227,7 @@ function standard_install() { foreach ($types as $type) { $type = node_type_set_defaults($type); node_type_save($type); + node_add_body_field($type); } // Insert default pre-defined RDF mapping into the database.