diff options
| -rw-r--r-- | modules/simpletest/tests/upgrade/upgrade.taxonomy.test | 6 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.install | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test index dadb98e5a..37de08775 100644 --- a/modules/simpletest/tests/upgrade/upgrade.taxonomy.test +++ b/modules/simpletest/tests/upgrade/upgrade.taxonomy.test @@ -68,6 +68,12 @@ class UpgradePathTaxonomyTestCase extends UpgradePathTestCase { sort($inst_keys); $this->assertEqual($voc_keys, $inst_keys, t('Node type page has instances for every vocabulary.')); + // Ensure instance variables are getting through. + foreach ($instances as $instance) { + $this->assertTrue(isset($instance['required']), 'The required setting was preserved during the upgrade path.'); + $this->assertTrue($instance['description'], 'The description was preserved during the upgrade path'); + } + // Node type 'story' was not explicitly in $vocabulary->nodes but // each node of type 'story' was associated to one or more terms. // Check that the node type 'story' has been associated only to diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install index 56b7e01c6..68fbc7804 100644 --- a/modules/taxonomy/taxonomy.install +++ b/modules/taxonomy/taxonomy.install @@ -438,6 +438,7 @@ function taxonomy_update_7004() { 'entity_type' => 'node', 'settings' => array(), 'description' => $vocabulary->help, + 'required' => $vocabulary->required, 'widget' => array(), 'display' => array( 'default' => array( |