From 76ac03de818cede2e55cfd806e532aad21231009 Mon Sep 17 00:00:00 2001 From: amontero Date: Mon, 30 Jul 2012 18:38:06 +0200 Subject: [PATCH] Issue #1308564: Basic token support in fields' help texts --- core/modules/field/field.form.inc | 4 ++-- core/modules/image/image.field.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc index 4cf953d..1fdcbe7 100644 --- a/core/modules/field/field.form.inc +++ b/core/modules/field/field.form.inc @@ -73,7 +73,7 @@ function field_default_form($entity_type, $entity, $field, $instance, $langcode, '#field_parents' => $parents, '#columns' => array_keys($field['columns']), '#title' => check_plain($instance['label']), - '#description' => field_filter_xss($instance['description']), + '#description' => field_filter_xss(token_replace($instance['description'])), // Only the first widget should be required. '#required' => $delta == 0 && $instance['required'], '#delta' => $delta, @@ -163,7 +163,7 @@ function field_multiple_value_form($field, $instance, $langcode, $items, &$form, } $title = check_plain($instance['label']); - $description = field_filter_xss($instance['description']); + $description = field_filter_xss(token_replace($instance['description'])); $id_prefix = implode('-', array_merge($parents, array($field_name))); $wrapper_id = drupal_html_id($id_prefix . '-add-more-wrapper'); diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc index 66d935f..ea84f60 100644 --- a/core/modules/image/image.field.inc +++ b/core/modules/image/image.field.inc @@ -342,7 +342,7 @@ function image_field_widget_form(&$form, &$form_state, $field, $instance, $langc if ($field['cardinality'] == 1) { // If there's only one field, return it as delta 0. if (empty($elements[0]['#default_value']['fid'])) { - $elements[0]['#description'] = theme('file_upload_help', array('description' => $instance['description'], 'upload_validators' => $elements[0]['#upload_validators'])); + $elements[0]['#description'] = theme('file_upload_help', array('description' => token_replace($instance['description']), 'upload_validators' => $elements[0]['#upload_validators'])); } } else { -- 1.7.11.3