diff --git a/modules/field/field.module b/modules/field/field.module index d110c48..63a91ca 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -492,8 +492,8 @@ function field_associate_fields($module) { */ function field_get_default_value($entity_type, $entity, $field, $instance, $langcode = NULL) { $items = array(); - if (!empty($instance['default_value_function'])) { - $function = $instance['default_value_function']; + if (!empty($instance['settings']['default_value_function'])) { + $function = $instance['settings']['default_value_function']; if (function_exists($function)) { $items = $function($entity_type, $entity, $field, $instance, $langcode); } diff --git a/modules/field/tests/field.test b/modules/field/tests/field.test index 669fc37..5fdaca7 100644 --- a/modules/field/tests/field.test +++ b/modules/field/tests/field.test @@ -440,7 +440,7 @@ class FieldAttachStorageTestCase extends FieldAttachTestCase { */ function testFieldAttachSaveMissingDataDefaultValue() { // Add a default value function. - $this->instance['default_value_function'] = 'field_test_default_value'; + $this->instance['settings']['default_value_function'] = 'field_test_default_value'; field_update_instance($this->instance); $entity_type = 'test_entity';