summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Leers2010-07-07 12:04:39 (GMT)
committer Wim Leers2010-07-07 12:04:39 (GMT)
commitbe32dceb17d25553e474c295a8c3db69eab95cee (patch)
tree18d9170f25f92c5e34573691b5375f511178a732
parente6ad9fa500eefd83fcfdce24eb8ead8107524862 (diff)
Minor bugfixes.
-rw-r--r--hierarchical_select.admin.inc2
-rw-r--r--hierarchical_select.module4
-rw-r--r--modules/hs_taxonomy.module4
3 files changed, 5 insertions, 5 deletions
diff --git a/hierarchical_select.admin.inc b/hierarchical_select.admin.inc
index e307ff8..9033c92 100644
--- a/hierarchical_select.admin.inc
+++ b/hierarchical_select.admin.inc
@@ -86,7 +86,7 @@ function hierarchical_select_admin_configs() {
$rows[$id] = array(
$item['hierarchy type'],
- $item['hierarchy'],
+ check_plain($item['hierarchy']),
$item['entity type'],
$item['entity'],
$item['context type'],
diff --git a/hierarchical_select.module b/hierarchical_select.module
index 598dfcd..2b98a72 100644
--- a/hierarchical_select.module
+++ b/hierarchical_select.module
@@ -384,7 +384,7 @@ function hierarchical_select_process($element, $edit, &$form_state, $form) {
$hsid = $_SESSION['hsid'];
}
else {
- $hsid = $element['#value']['hsid'];
+ $hsid = check_plain($element['#value']['hsid']);
}
$element['hsid'] = array('#type' => 'hidden', '#value' => $hsid);
// A hierarchical_select form element expands to multiple items. For example
@@ -2118,7 +2118,7 @@ function _hierarchical_select_dropbox_generate($config, $selection) {
// We will also need the labels of each item in the rendering layer.
foreach ($dropbox->lineages as $id => $lineage) {
foreach ($lineage as $level => $item) {
- $dropbox->lineages[$id][$level] = array('value' => $item, 'label' => module_invoke($config['module'], 'hierarchical_select_item_get_label', $item, $config['params']));
+ $dropbox->lineages[$id][$level] = array('value' => $item, 'label' => check_plain(module_invoke($config['module'], 'hierarchical_select_item_get_label', $item, $config['params'])));
}
}
}
diff --git a/modules/hs_taxonomy.module b/modules/hs_taxonomy.module
index ce873da..3cfdfe8 100644
--- a/modules/hs_taxonomy.module
+++ b/modules/hs_taxonomy.module
@@ -202,11 +202,11 @@ function hs_taxonomy_form($vid, $value = 0, $help = NULL) {
$vocabulary = taxonomy_vocabulary_load($vid);
if (module_exists('i18ntaxonomy')) {
$title = check_plain(tt("taxonomy:vocabulary:$vid:name", $vocabulary->name));
- $description = ($help) ? $help : tt("taxonomy:vocabulary:$vid:help", $vocabulary->help);
+ $description = check_plain(($help) ? $help : tt("taxonomy:vocabulary:$vid:help", $vocabulary->help));
}
else {
$title = check_plain($vocabulary->name);
- $description = ($help) ? $help : $vocabulary->help;
+ $description = check_plain(($help) ? $help : $vocabulary->help);
}
$form_item = array(