summaryrefslogtreecommitdiff
path: root/modules/field
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-13 05:40:03 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-13 05:40:03 +0000
commit02d2f6e04a29acb1c3fcedcd5068878cffb10fbf (patch)
tree48d65b410f2dc34eaf8d69a822a09ec83e9d85df /modules/field
parent5d2cdb6ba95549da448e0a127e40fcc375e3886c (diff)
downloadbrdo-02d2f6e04a29acb1c3fcedcd5068878cffb10fbf.tar.gz
brdo-02d2f6e04a29acb1c3fcedcd5068878cffb10fbf.tar.bz2
#678714 by effulgentsia: Unify use of theme hook / template suggestions, fix clobbering problems, and improve suggestion discovery performance.
Diffstat (limited to 'modules/field')
-rw-r--r--modules/field/field.module8
1 files changed, 4 insertions, 4 deletions
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);