From 2fd22bd09f6be148c6b5f7ec888c15f910c940ed Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Tue, 13 Oct 2015 00:18:03 -0400
Subject: Issue #955658 by Refineo, dswier, steinmb, emorency, filijonka,
 yched, Bevan: Undefined index: module in FieldInfo::prepareInstanceDisplay()

---
 modules/field/field.info.class.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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.
-- 
cgit v1.2.3