From 02d2f6e04a29acb1c3fcedcd5068878cffb10fbf Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 13 Jan 2010 05:40:03 +0000
Subject: #678714 by effulgentsia: Unify use of theme hook / template
 suggestions, fix clobbering problems, and improve suggestion discovery
 performance.

---
 modules/field/field.module | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/field')

diff --git a/modules/field/field.module b/modules/field/field.module
index 4f3518007..5c209e300 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -777,11 +777,11 @@ function template_preprocess_field(&$variables) {
       'field-type-' . $field_type_css,
       'field-label-' . $element['#label_display'],
     ),
-    'template_files' => array(
+    'theme_hook_suggestions' => array(
       'field',
-      'field-' . $element['#field_name'],
-      'field-' . $element['#bundle'],
-      'field-' . $element['#field_name'] . '-' . $element['#bundle'],
+      'field__' . $element['#field_name'],
+      'field__' . $element['#bundle'],
+      'field__' . $element['#field_name'] . '__' . $element['#bundle'],
     ),
   );
   $variables = array_merge($variables, $additions);
-- 
cgit v1.2.3