Quantcast
Channel: Issues for Drupal core
Viewing all articles
Browse latest Browse all 292206

Fields do not support tokens in prefix and suffix, nor help

$
0
0

Patch below soles the problem in case of numeric field

diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index 280f778..cbd6c9a 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -194,7 +194,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/modules/field/field.module b/modules/field/field.module
index 4331cdf..fdbd2b4 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -487,6 +487,13 @@ function field_get_default_value($entity_type, $entity, $field, $instance, $lang
elseif (!empty($instance['default_value'])) {
$items = $instance['default_value'];
}
+
+ foreach ($items as $key => $value) {
+ if (is_string($value['value'])) {
+ $items[$key]['value'] = token_replace($value['value']);
+ }
+ }
+
return $items;
}

diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index 6046544..4146746 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -350,11 +350,11 @@ function number_field_widget_form(&$form, &$form_state, $field, $instance, $lang
// Add prefix and suffix.
if (!empty($instance['settings']['prefix'])) {
$prefixes = explode('|', $instance['settings']['prefix']);
- $element['#field_prefix'] = field_filter_xss(array_pop($prefixes));
+ $element['#field_prefix'] = field_filter_xss(token_replace(array_pop($prefixes)));
}
if (!empty($instance['settings']['suffix'])) {
$suffixes = explode('|', $instance['settings']['suffix']);
- $element['#field_suffix'] = field_filter_xss(array_pop($suffixes));
+ $element['#field_suffix'] = field_filter_xss(token_replace(array_pop($suffixes)));
}

$element['#element_validate'][] = 'number_field_widget_validate';


Viewing all articles
Browse latest Browse all 292206

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>