From 2344dfe7f72f4c3dffc9b989fb1a8526e1f1eb62 2014-03-29 14:38:47
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2014-03-29 14:38:47
Subject: [PATCH] Merged r12968 (#16319).

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13024 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index a99c15d..48ef2c7 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -114,7 +114,7 @@ class CustomField < ActiveRecord::Base
   end
 
   def possible_values
-    values = super()
+    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)
@@ -128,7 +128,8 @@ class CustomField < ActiveRecord::Base
   # Makes possible_values accept a multiline string
   def possible_values=(arg)
     if arg.is_a?(Array)
-      super(arg.compact.collect(&:strip).select {|v| !v.blank?})
+      values = arg.compact.collect(&:strip).select {|v| !v.blank?}
+      write_attribute(:possible_values, values)
     else
       self.possible_values = arg.to_s.split(/[\n\r]+/)
     end