summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-10-13 00:18:03 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-10-13 00:18:03 -0400
commit2fd22bd09f6be148c6b5f7ec888c15f910c940ed (patch)
treeaa2699080eba4e5ded619260c83e7f3777404e4a
parente719d5cfe23d9b319bdb064f15dcd53eb6fc2070 (diff)
downloadbrdo-2fd22bd09f6be148c6b5f7ec888c15f910c940ed.tar.gz
brdo-2fd22bd09f6be148c6b5f7ec888c15f910c940ed.tar.bz2
Issue #955658 by Refineo, dswier, steinmb, emorency, filijonka, yched, Bevan: Undefined index: module in FieldInfo::prepareInstanceDisplay()
-rw-r--r--modules/field/field.info.class.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/field/field.info.class.inc b/modules/field/field.info.class.inc
index f4f1f6300..772cd451f 100644
--- a/modules/field/field.info.class.inc
+++ b/modules/field/field.info.class.inc
@@ -612,10 +612,12 @@ class FieldInfo {
// Fill in default values.
$display += array(
'label' => 'above',
- 'type' => $field_type_info['default_formatter'],
'settings' => array(),
'weight' => 0,
);
+ if (empty($display['type'])) {
+ $display['type'] = $field_type_info['default_formatter'];
+ }
if ($display['type'] != 'hidden') {
$formatter_type_info = field_info_formatter_types($display['type']);
// Fall back to default formatter if formatter type is not available.