diff options
author | Gábor Hojtsy | 2009-05-13 19:38:33 (GMT) |
---|---|---|
committer | Gábor Hojtsy | 2009-05-13 19:38:33 (GMT) |
commit | 84f629ace76044177ddd24ad03c2566b9af1688b (patch) | |
tree | e3e8df05087c68ab33c7fedf2f2763be408da4d4 | |
parent | 8068958d9dba3de7e839d38574d785fe70c405dd (diff) |
Drupal 6.126.12
-rw-r--r-- | modules/taxonomy/taxonomy.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index bf59528..4a07d26 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -415,7 +415,7 @@ function taxonomy_del_term($tid) { */ function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') { $vocabulary = taxonomy_vocabulary_load($vid); - $help = ($help) ? $help : $vocabulary->help; + $help = ($help) ? $help : filter_xss_admin($vocabulary->help); if (!$vocabulary->multiple) { $blank = ($vocabulary->required) ? t('- Please choose -') : t('- None selected -'); @@ -424,7 +424,7 @@ function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') { $blank = ($vocabulary->required) ? 0 : t('- None -'); } - return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, filter_xss_admin($help), intval($vocabulary->multiple), $blank); + return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank); } /** @@ -538,7 +538,7 @@ function taxonomy_form_alter(&$form, $form_state, $form_id) { $default_terms[$term->tid] = $term; } } - $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), $vocabulary->help); + $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), filter_xss_admin($vocabulary->help)); $form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight; $form['taxonomy'][$vocabulary->vid]['#required'] = $vocabulary->required; } |