diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-12-31 15:56:32 -0800 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-12-31 15:56:32 -0800 |
| commit | 5f9bb354ef83b7e8c3cfaad5e8ab95b435ae47f5 (patch) | |
| tree | 772604b676fae48b1e0a701cd008e75cc5f5a6e8 /modules | |
| parent | 96882a91d8773c60540dea5e3a05308e310a880c (diff) | |
| download | brdo-5f9bb354ef83b7e8c3cfaad5e8ab95b435ae47f5.tar.gz brdo-5f9bb354ef83b7e8c3cfaad5e8ab95b435ae47f5.tar.bz2 | |
Issue #1380660 by aspilicious, loganfsmyth: Fixed field_available_languages() static cache never cleared.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/field/field.info.inc | 1 | ||||
| -rw-r--r-- | modules/field/tests/field.test | 2 | ||||
| -rw-r--r-- | modules/simpletest/tests/entity_query.test | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc index 6724a208b..77e9b441a 100644 --- a/modules/field/field.info.inc +++ b/modules/field/field.info.inc @@ -27,6 +27,7 @@ */ function field_info_cache_clear() { drupal_static_reset('field_view_mode_settings'); + drupal_static_reset('field_available_languages'); // @todo: Remove this when field_attach_*_bundle() bundle management // functions are moved to the entity API. diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index 669fc37cf..3ec85075f 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -2674,7 +2674,7 @@ class FieldTranslationsTestCase extends FieldTestCase { // Test field_available_languages() behavior for untranslatable fields. $this->field['translatable'] = FALSE; - $this->field_name = $this->field['field_name'] = $this->instance['field_name'] = drupal_strtolower($this->randomName() . '_field_name'); + field_update_field($this->field); $available_languages = field_available_languages($this->entity_type, $this->field); $this->assertTrue(count($available_languages) == 1 && $available_languages[0] === LANGUAGE_NONE, t('For untranslatable fields only LANGUAGE_NONE is available.')); } diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test index ec951f8e2..97214206f 100644 --- a/modules/simpletest/tests/entity_query.test +++ b/modules/simpletest/tests/entity_query.test @@ -1084,7 +1084,6 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase { $this->fields[0]['cardinality'] = 1; field_update_field($this->fields[0]); field_test_entity_info_translatable('test_entity', TRUE); - drupal_static_reset('field_available_languages'); // Create more items with different languages. $entity = new stdClass(); @@ -1121,7 +1120,6 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase { $this->fields[0]['translatable'] = TRUE; field_update_field($this->fields[0]); field_test_entity_info_translatable('test_entity', TRUE); - drupal_static_reset('field_available_languages'); // Create more items with different languages. $entity = new stdClass(); |