diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index 2df1cd24bcfd11ccf221b7a21c12c9ca0c18d3a9..d06072e830c75e9b33e7abe960c3ef69311d1d31 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -473,9 +473,8 @@ class tform_base {
if(is_array($field['value'])) {
foreach($field['value'] as $k => $v) {
$selected = ($k == $val)?' SELECTED':'';
- if(isset($this->wordbook[$v]))
- $v = $this->wordbook[$v];
- $v = $app->functions->htmlentities($v);
+ if(isset($this->wordbook[$v])) $v = $this->wordbook[$v];
+ else $v = $app->functions->htmlentities($v);
$out .= "\r\n";
}
}
@@ -914,7 +913,7 @@ class tform_base {
$returnval = preg_replace('/\s+/', '', $returnval);
break;
case 'STRIPTAGS':
- $returnval = strip_tags(preg_replace('/