Index: webform.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v retrieving revision 1.113.2.70.2.34 diff -u -r1.113.2.70.2.34 webform.module --- webform.module 31 Mar 2008 20:31:58 -0000 1.113.2.70.2.34 +++ webform.module 2 Apr 2008 00:14:29 -0000 @@ -1739,6 +1739,13 @@ } /** + * Filters all special tokens provided by webform, and allows basic layout in descriptions. + */ +function _webform_filterdescriptions($string, $node = NULL, $submission = NULL, $strict = TRUE) { + return check_markup(_webform_filtervalues($string, $node = NULL, $submission = NULL, $strict = TRUE)); +} + +/** * Menu callback for admin/content/webform. Displays all webforms on the site. */ function webform_admin_content() { Index: webform_components.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform_components.inc,v retrieving revision 1.1.2.17 diff -u -r1.1.2.17 webform_components.inc --- webform_components.inc 15 Mar 2008 01:03:25 -0000 1.1.2.17 +++ webform_components.inc 1 Apr 2008 23:06:25 -0000 @@ -283,10 +283,9 @@ '#weight' => -1, ); $form['extra']['description'] = array( - '#type' => 'textfield', + '#type' => 'textarea', '#default_value' => isset($component['extra']['description']) ? $component['extra']['description'] : '', '#title' => t("Description"), - '#maxlength' => '512', '#description' => t('A short description of the field used as help for the user when he/she uses the form.') .'
'. webform_help('webform/helptext#variables'), '#weight' => -1, ); Index: components/date.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/date.inc,v retrieving revision 1.13.2.15.2.1 diff -u -r1.13.2.15.2.1 date.inc --- components/date.inc 27 Jan 2008 23:07:25 -0000 1.13.2.15.2.1 +++ components/date.inc 2 Apr 2008 00:11:27 -0000 @@ -84,7 +84,7 @@ '#title' => $component['name'], '#weight' => $component['weight'], '#theme' => 'webform_date', - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#prefix' => '
', '#suffix' => '
', '#required' => $component['mandatory'], Index: components/email.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/email.inc,v retrieving revision 1.16.2.7.2.5 diff -u -r1.16.2.7.2.5 email.inc --- components/email.inc 29 Mar 2008 19:46:31 -0000 1.16.2.7.2.5 +++ components/email.inc 2 Apr 2008 00:11:33 -0000 @@ -83,7 +83,7 @@ '#default_value' => _webform_filtervalues($component['value']), '#required' => $component['mandatory'], '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#attributes' => $component['extra']['attributes'], '#disabled' => $component['extra']['disabled'], '#prefix' => '
', Index: components/fieldset.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/fieldset.inc,v retrieving revision 1.3.4.4.2.1 diff -u -r1.3.4.4.2.1 fieldset.inc --- components/fieldset.inc 29 Mar 2008 19:46:31 -0000 1.3.4.4.2.1 +++ components/fieldset.inc 2 Apr 2008 00:11:41 -0000 @@ -42,7 +42,7 @@ '#type' => $component['type'], '#title' => htmlspecialchars($component['name'], ENT_QUOTES), '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#collapsible' => $component['extra']['collapsible'], '#collapsed' => $component['extra']['collapsed'], '#attributes' => array("class" => "webform-component-". $component['type'], "id" => "webform-component-". $component['form_key']), Index: components/file.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/file.inc,v retrieving revision 1.2.2.19.2.4 diff -u -r1.2.2.19.2.4 file.inc --- components/file.inc 22 Mar 2008 04:06:53 -0000 1.2.2.19.2.4 +++ components/file.inc 2 Apr 2008 00:11:49 -0000 @@ -187,7 +187,7 @@ '#title' => $component['name'], //'#required' => $component['mandatory'], // Drupal core bug with required file uploads '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#attributes' => $component['extra']['attributes'], '#tree' => false, // file_check_upload assumes a flat $_FILES structure. '#validate' => array( Index: components/grid.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/grid.inc,v retrieving revision 1.1.2.3.2.2 diff -u -r1.1.2.3.2.2 grid.inc --- components/grid.inc 21 Mar 2008 20:34:51 -0000 1.1.2.3.2.2 +++ components/grid.inc 2 Apr 2008 00:12:16 -0000 @@ -75,7 +75,7 @@ '#required' => $component['mandatory'], '#weight' => $component['weight'], '#theme' => 'webform_grid', - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), ); $questions = explode("\n", _webform_filtervalues($component['extra']['questions'], NULL, NULL, FALSE)); Index: components/select.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v retrieving revision 1.18.2.19.2.11 diff -u -r1.18.2.19.2.11 select.inc --- components/select.inc 21 Mar 2008 17:45:12 -0000 1.18.2.19.2.11 +++ components/select.inc 2 Apr 2008 00:12:46 -0000 @@ -82,7 +82,7 @@ '#title' => $component['name'], '#required' => $component['mandatory'], '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#prefix' => '
', '#suffix' => '
', ); Index: components/textarea.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/textarea.inc,v retrieving revision 1.11.2.4.2.2 diff -u -r1.11.2.4.2.2 textarea.inc --- components/textarea.inc 1 Feb 2008 00:41:29 -0000 1.11.2.4.2.2 +++ components/textarea.inc 2 Apr 2008 00:10:54 -0000 @@ -62,7 +62,7 @@ '#default_value' => _webform_filtervalues($component['value']), '#required' => $component['mandatory'], '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#rows' => $component['extra']['rows'], '#cols' => $component['extra']['cols'], '#attributes' => $component['extra']['attributes'], Index: components/textfield.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/textfield.inc,v retrieving revision 1.11.2.7.2.2 diff -u -r1.11.2.7.2.2 textfield.inc --- components/textfield.inc 1 Feb 2008 00:41:29 -0000 1.11.2.7.2.2 +++ components/textfield.inc 2 Apr 2008 00:13:09 -0000 @@ -64,7 +64,7 @@ '#default_value' => _webform_filtervalues($component['value']), '#required' => $component['mandatory'], '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#attributes' => $component['extra']['attributes'], '#disabled' => $component['extra']['disabled'], '#prefix' => '
', Index: components/time.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/time.inc,v retrieving revision 1.14.2.6.2.2 diff -u -r1.14.2.6.2.2 time.inc --- components/time.inc 22 Mar 2008 02:59:57 -0000 1.14.2.6.2.2 +++ components/time.inc 2 Apr 2008 00:13:53 -0000 @@ -103,7 +103,7 @@ '#title' => $component['name'], '#required' => $component['mandatory'], '#weight' => $component['weight'], - '#description' => _webform_filtervalues($component['extra']['description']), + '#description' => _webform_filterdescriptions($component['extra']['description']), '#prefix' => '
', '#suffix' => '
', '#theme' => 'webform_time',