3 files changed, 9 insertions, 7 deletions
diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl
index 9d318cd1d..bd6c427e6 100644
--- a/template/en/default/admin/fieldvalues/create.html.tmpl
+++ b/template/en/default/admin/fieldvalues/create.html.tmpl
@@ -34,8 +34,10 @@
   <table border="0" cellpadding="4" cellspacing="0">
     <tr>
       <th align="right"><label for="value">Value:</label></th>
-      <td><input id="value" name="value" size="30"
-                  maxlength="[% constants.MAX_FIELD_VALUE_SIZE %]"></td>
+      <td>
+        <input id="value" name="value" size="30"
+               maxlength="[% constants.MAX_FIELD_VALUE_SIZE FILTER none %]">
+      </td>
     </tr>
     <tr>
       <th align="right"><label for="sortkey">Sortkey:</label></th>
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 29f881ec8..f12383866 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -40,7 +40,7 @@
             [%- value.name FILTER html %]
         [% ELSE %]
           <input id="value_new" name="value_new" size="20"
-                 maxlength="[% constants.MAX_FIELD_VALUE_SIZE %]"
+                 maxlength="[% constants.MAX_FIELD_VALUE_SIZE FILTER none %]"
                  value="[% value.name FILTER html %]">
         [% END %]
       </td>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c7b83e334..1b737744c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -441,9 +441,9 @@
 
   [% ELSIF error == "fieldvalue_name_too_long" %]
     [% title = "Field Value Is Too Long" %]
-    The value of a field is limited to [% constants.FIELD_VALUE_MAX_SIZE %]
-    characters. '[% value FILTER html %]' is too long ([% value.length %]
-    characters).
+    The value of a field is limited to 
+    [%+ constants.FIELD_VALUE_MAX_SIZE FILTER none %] characters. 
+    '[% value FILTER html %]' is too long ([% value.length %] characters).
 
   [% ELSIF error == "fieldvalue_not_editable" %]
     [% title = "Field Value Not Editable" %]
@@ -1667,6 +1667,6 @@
     field
   [% ELSIF ( matches = class.match('^Bugzilla::Field::Choice::(.+)') ) %]
     [% SET field_name = matches.0 %]
-    [% field_descs.$field_name %]
+    [% field_descs.$field_name FILTER html %]
   [% END %]
 [% END %]