diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index 9b24d94..fa694ff 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -1565,7 +1565,7 @@ function field_entity_bundle_delete($entity_type, $bundle) { // Get the instances on the bundle. field_read_instances() must be used // here since field_info_instances() does not return instances for disabled // entity types or bundles. - $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle), array('include_inactive' => 1)); + $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle), array('include_inactive' => TRUE)); foreach ($instances as $instance) { field_delete_instance($instance); } diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php index 0ae1dc0..122d14c 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php @@ -18,7 +18,7 @@ public static function getInfo() { } /** - * Test that field types and field definitions are correcly cached. + * Test that field types and field definitions are correctly cached. */ function testFieldInfo() { // Test that field_test module's fields, widgets, and formatters show up. @@ -69,7 +69,7 @@ function testFieldInfo() { $this->assertEqual($fields[$field['field_name']]['settings'][$key], $val, format_string('Field setting %key has correct default value %value', array('%key' => $key, '%value' => $val))); } $this->assertEqual($fields[$field['field_name']]['cardinality'], 1, 'info fields contains cardinality 1'); - $this->assertEqual($fields[$field['field_name']]['active'], 1, 'info fields contains active 1'); + $this->assertEqual($fields[$field['field_name']]['active'], TRUE, 'info fields contains active 1'); // Create an instance, verify that it shows up $instance = array(