Merged r10992 from trunk (#12400).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@11005 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/custom_field.rb

@@ -130,7 +130,13 @@ class CustomField < ActiveRecord::Base
     possible_values_options = possible_values_options(customized)
     if possible_values_options.present?
       keyword = keyword.to_s.downcase
-      possible_values_options.detect {|text, id| text.downcase == keyword}.try(:last)
+      if v = possible_values_options.detect {|text, id| text.downcase == keyword}
+        if v.is_a?(Array)
+          v.last
+        else
+          v
+        end
+      end
     else
       keyword
     end