commit db68ac0fdaf0233d659608c22c904e95c9d593be Author: fago Date: Thu Jun 20 17:53:40 2013 +0200 Moved cache clear to entity_info_cache_clear(). diff --git a/core/includes/entity.inc b/core/includes/entity.inc index 743cc4a..6d121dc 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -45,6 +45,9 @@ function entity_info_cache_clear() { // Clear all languages. Drupal::entityManager()->clearCachedDefinitions(); Drupal::entityManager()->clearCachedFieldDefinitions(); + Drupal::service('plugin.manager.entity.field.field_type')->clearCachedDefinitions(); + // Clear typed data definitions. + Drupal::typedData()->clearCachedDefinitions(); } /** diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc index 667a71a..0f78e0b 100644 --- a/core/modules/field/field.info.inc +++ b/core/modules/field/field.info.inc @@ -37,10 +37,6 @@ function field_info_cache_clear() { // functions are moved to the entity API. entity_info_cache_clear(); - // Clear typed data definitions. - Drupal::typedData()->clearCachedDefinitions(); - Drupal::service('plugin.manager.entity.field.field_type')->clearCachedDefinitions(); - _field_info_collate_types_reset(); Field::fieldInfo()->flush(); }