diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 325bf9a..e08bc48 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -252,7 +252,7 @@ function field_entity_bundle_delete($entity_type, $bundle) { // Get the instances on the bundle. entity_load_multiple_by_properties() must be // used here since field_info_instances() does not return instances for disabled // entity types or bundles. - $instances = entity_load_multiple_by_properties('field_instance', array('entity_type' => $entity_type, 'bundle' => $bundle, 'include_inactive' => TRUE)); + $instances = entity_load_multiple_by_properties('field_instance', array('entity_type' => $entity_type, 'bundle' => $bundle)); foreach ($instances as $instance) { $instance->delete(); } diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php index 3e69ae6..3b3e397 100644 --- a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php +++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php @@ -164,8 +164,6 @@ public function loadByProperties(array $conditions = array()) { } } - $this->moduleHandler->invokeAll('field_read_instance', $instance); - $matching_instances[] = $instance; } diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/Drupal/field/FieldStorageController.php index 3f6408f..eac89c2 100644 --- a/core/modules/field/lib/Drupal/field/FieldStorageController.php +++ b/core/modules/field/lib/Drupal/field/FieldStorageController.php @@ -138,8 +138,6 @@ public function loadByProperties(array $conditions = array()) { } } - $this->moduleHandler->invokeAll('field_read_field', $field); - // When returning deleted fields, key the results by UUID since they can // include several fields with the same ID. $key = $include_deleted ? $field->uuid : $field->id; diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php index e4185b3..349ee4c 100644 --- a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php @@ -78,7 +78,7 @@ function setUp() { 'bundle' => $this->entity_type, ); entity_create('field_instance', $instance)->save(); - $this->instance = entity_load('field_instance', 'entity_test.' . $this->instance_definition['bundle'] . '.' . $this->field_name); + $this->instance = entity_load('field_instance', 'entity_test.' . $instance['bundle'] . '.' . $this->field_name); entity_get_form_display($this->entity_type, $this->entity_type, 'default') ->setComponent($this->field_name)