summaryrefslogtreecommitdiff
path: root/modules/field/field.crud.inc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/field/field.crud.inc')
-rw-r--r--modules/field/field.crud.inc13
1 files changed, 0 insertions, 13 deletions
diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc
index 91fb159ed..ca19d5ebb 100644
--- a/modules/field/field.crud.inc
+++ b/modules/field/field.crud.inc
@@ -339,10 +339,6 @@ function field_read_fields($params = array(), $include_additional = array()) {
unset($field['data']);
$field += $data;
- // Make sure all settings expected in the current execution context are
- // present.
- $field['settings'] += field_info_field_settings($field['type']);
-
module_invoke_all('field_read_field', $field);
// Populate storage information.
@@ -624,7 +620,6 @@ function field_read_instances($params = array(), $include_additional = array())
$query = db_select('field_config_instance', 'fci', array('fetch' => PDO::FETCH_ASSOC));
$query->join('field_config', 'fc', 'fc.id = fci.field_id');
$query->fields('fci');
- $query->fields('fc', array('type'));
// Turn the conditions into a query.
foreach ($params as $key => $value) {
@@ -654,14 +649,6 @@ function field_read_instances($params = array(), $include_additional = array())
$instance['widget']['module'] = $record['widget_module'];
$instance['widget']['active'] = $record['widget_active'];
- // Make sure all settings expected in the current execution context are
- // present.
- $instance['settings'] += field_info_instance_settings($record['type']);
- $instance['widget']['settings'] += field_info_widget_settings($instance['widget']['type']);
- foreach ($instance['display'] as $build_mode => $display) {
- $instance['display'][$build_mode]['settings'] += field_info_formatter_settings($display['type']);
- }
-
module_invoke_all('field_read_instance', $instance);
$instances[] = $instance;
}