From 181a4d5d20a5b416d5ad2fac496cb7c99e834194 Mon Sep 17 00:00:00 2001
From: Matt G <madmatter23@gmail.com>
Date: Fri, 18 Nov 2011 11:55:43 -0600
Subject: [PATCH] adding token support for field default_values, help text, and descriptions

---
 core/modules/field/field.form.inc |    4 ++--
 core/modules/field/field.module   |    7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 core/modules/field/field.form.inc
 mode change 100644 => 100755 core/modules/field/field.module

diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc
old mode 100644
new mode 100755
index be3685d..99d75de
--- a/core/modules/field/field.form.inc
+++ b/core/modules/field/field.form.inc
@@ -70,7 +70,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/field/field.module b/core/modules/field/field.module
old mode 100644
new mode 100755
index 70b17f5..dcade14
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -501,6 +501,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;
 }
 
-- 
1.7.1