diff options
| -rw-r--r-- | app/models/custom_field.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 02736aea2..75fac2464 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -80,7 +80,7 @@ class CustomField < ActiveRecord::Base when 'bool' [[l(:general_text_Yes), '1'], [l(:general_text_No), '0']] else - read_attribute(:possible_values) || [] + read_possible_values_utf8_encoded || [] end end @@ -91,7 +91,7 @@ class CustomField < ActiveRecord::Base when 'bool' ['1', '0'] else - read_attribute :possible_values + read_possible_values_utf8_encoded end end @@ -218,4 +218,14 @@ class CustomField < ActiveRecord::Base end errs end + + def read_possible_values_utf8_encoded + values = read_attribute(:possible_values) + if values.is_a?(Array) + values.each do |value| + value.force_encoding('UTF-8') if value.respond_to?(:force_encoding) + end + end + values + end end |