From a3f4ab154828c90f4bc37ea4bf8edff8573921db Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sun, 17 Jul 2011 23:53:32 -0700
Subject: [PATCH] Issue #931512 by ahwebd, catch, tobiasb: Fixed Node body
'description' and 'required' are missed on nodes upgraded from D6 to D7.
---
modules/node/node.install | 2 ++
modules/simpletest/tests/upgrade/upgrade.node.test | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/modules/node/node.install b/modules/node/node.install
index 852c1117b11e..a08e99757060 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -628,6 +628,8 @@ function node_update_7006(&$sandbox) {
'entity_type' => 'node',
'bundle' => $node_type->type,
'label' => $node_type->body_label,
+ 'description' => isset($node_type->description) ? $node_type->description : '',
+ 'required' => (isset($node_type->min_word_count) && $node_type->min_word_count > 0) ? 1 : 0,
'widget' => array(
'type' => 'text_textarea_with_summary',
'settings' => array(
diff --git a/modules/simpletest/tests/upgrade/upgrade.node.test b/modules/simpletest/tests/upgrade/upgrade.node.test
index 163dbef5e9db..cd44790c7288 100644
--- a/modules/simpletest/tests/upgrade/upgrade.node.test
+++ b/modules/simpletest/tests/upgrade/upgrade.node.test
@@ -27,6 +27,11 @@ class NodeBodyUpgradePathTestCase extends UpgradePathTestCase {
*/
public function testNodeBodyUpgrade() {
$this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+
+ $instance = field_info_instance('node', 'body', 'story');
+ $this->assertIdentical($instance['required'], 0, 'The required setting was preserved during the upgrade path.');
+ $this->assertTrue($instance['description'], 'The description was preserved during the upgrade path');
+
$this->drupalGet("content/1263769200");
$this->assertText('node body (broken) - 37');
--
GitLab