Follow-up fix for bug#10361: Incorrect handling of special characters…

… in DynamicFields.
OTRS · Mar 21, 2014 · c45500f · c45500f
1 parent 5796222
commit c45500f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/Kernel/System/DynamicField/Backend/Checkbox.pm b/Kernel/System/DynamicField/Backend/Checkbox.pm
@@ -258,8 +258,12 @@ Ignore this field.
 EOF
     }
 
+    my $FieldLabelEscaped = $Param{LayoutObject}->Ascii2Html(
+        Text => $FieldLabel,
+    );
+
     $HTMLString .= <<"EOF";
-<input type="checkbox" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabel" $FieldChecked value="1" />
+<input type="checkbox" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabelEscaped" $FieldChecked value="1" />
 EOF
 
     if ( $Param{Mandatory} ) {

diff --git a/Kernel/System/DynamicField/Backend/Text.pm b/Kernel/System/DynamicField/Backend/Text.pm
@@ -397,8 +397,16 @@ sub SearchFieldRender {
     # check and set class if necessary
     my $FieldClass = 'DynamicFieldText';
 
+    my $FieldLabelEscaped = $Param{LayoutObject}->Ascii2Html(
+        Text => $FieldLabel,
+    );
+
+    my $ValueEscaped = $Param{LayoutObject}->Ascii2Html(
+        Text => $Value,
+    );
+
     my $HTMLString = <<"EOF";
-<input type="text" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabel" value="$Value" />
+<input type="text" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabelEscaped" value="$ValueEscaped" />
 EOF
 
     my $AdditionalText;

diff --git a/Kernel/System/DynamicField/Backend/TextArea.pm b/Kernel/System/DynamicField/Backend/TextArea.pm
@@ -440,8 +440,16 @@ sub SearchFieldRender {
     # check and set class if necessary
     my $FieldClass = 'DynamicFieldText';
 
+    my $FieldLabelEscaped = $Param{LayoutObject}->Ascii2Html(
+        Text => $FieldLabel,
+    );
+
+    my $ValueEscaped = $Param{LayoutObject}->Ascii2Html(
+        Text => $Value,
+    );
+
     my $HTMLString = <<"EOF";
-<input type="text" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabel" value="$Value" />
+<input type="text" class="$FieldClass" id="$FieldName" name="$FieldName" title="$FieldLabelEscaped" value="$ValueEscaped" />
 EOF
 
     # call EditLabelRender on the common backend