Issue #3415154 by swentel, dpi: Missing template suggestions after upgrading to 3.17

ds.module

@@ -876,7 +876,7 @@ function ds_theme_suggestions_field_alter(&$suggestions, $variables) {
       // Or the template file(s).
       $suggestion = 'field__' . $config['id'];
     }
-    elseif (!empty($field_theme_function) && $field_theme_function != 'default') {
+    elseif (!empty($field_theme_function)) {
       // Either it uses the function.
       if ($undo_default_field_template_fix) {
         $suggestions[] = 'field__theme_ds_field_' . $field_theme_function;
@@ -886,7 +886,14 @@ function ds_theme_suggestions_field_alter(&$suggestions, $variables) {
       }
 
       // Or the template file(s).
-      $suggestion = 'field__' . $field_theme_function;
+      $set_suggestion = TRUE;
+      if ($field_theme_function == 'default' && !$undo_default_field_template_fix) {
+        $set_suggestion = FALSE;
+      }
+
+      if ($set_suggestion) {
+        $suggestion = 'field__' . $field_theme_function;
+      }
     }
 
     if (!empty($suggestion)) {