diff options
| author | David Rothstein <drothstein@gmail.com> | 2013-01-27 16:21:18 -0500 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2013-01-27 16:21:18 -0500 |
| commit | bd1dc1fdbb428bc745f26b1183e1052603cd1d6e (patch) | |
| tree | a695ab119da16a609e7b7637bd882302a0230f30 /modules/field/field.module | |
| parent | 6a4df4adedc949f7441493e75e8ae73f847bfa10 (diff) | |
| download | brdo-bd1dc1fdbb428bc745f26b1183e1052603cd1d6e.tar.gz brdo-bd1dc1fdbb428bc745f26b1183e1052603cd1d6e.tar.bz2 | |
Issue #1040790 by yched, swentel, geerlingguy, justin.randell, Berdir | catch: Fixed _field_info_collate_fields() memory usage.
Diffstat (limited to 'modules/field/field.module')
| -rw-r--r-- | modules/field/field.module | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/field/field.module b/modules/field/field.module index 65dd48cfd..4331cdf42 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -873,7 +873,8 @@ function field_view_field($entity_type, $entity, $field_name, $display = array() if ($field = field_info_field($field_name)) { if (is_array($display)) { // When using custom display settings, fill in default values. - $display = _field_info_prepare_instance_display($field, $display); + $cache = _field_info_field_cache(); + $display = $cache->prepareInstanceDisplay($display, $field["type"]); } // Hook invocations are done through the _field_invoke() functions in |