Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.113.2.70.2.38
diff -u -r1.113.2.70.2.38 webform.module
--- webform.module	3 Apr 2008 03:52:54 -0000	1.113.2.70.2.38
+++ webform.module	6 Apr 2008 18:58:27 -0000
@@ -1679,7 +1679,7 @@
 /**
  * Filters all special tokens provided by webform, such as %post and %profile.
  */
-function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE) {
+function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE, $description = false) {
   global $user;
 
   // Setup default token replacements.
@@ -1734,7 +1734,8 @@
     $string = preg_replace('/\\'. $token .'\[\w+\]/', '', $string);
   }
 
-  if ($strict) {
+  // description will call check_markup on its own
+  if ($strict && !$description) {
     return filter_xss($string);
   }
   else {
@@ -1746,7 +1747,7 @@
  * Filters all special tokens provided by webform, and allows basic layout in descriptions.
  */
 function _webform_filter_descriptions($string, $node = NULL, $submission = NULL, $strict = TRUE) {
-  return check_markup(_webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE));
+  return check_markup(_webform_filter_values($string, $node, $submission, $strict, true));
 }
 
 /**