Merged r12126 from trunk (#13008).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12127 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang committed 2013-09-10 17:40:34 +00:00
1 parent e7c82e3934
commit ddc016d81d
2 files changed
+7 -2

No files matched your search

+2 -2
View File
@@ -33,7 +33,7 @@ class UserPreference < ActiveRecord::Base
end
def [](attr_name)
if attribute_present? attr_name
if has_attribute? attr_name
super
else
others ? others[attr_name] : nil
@@ -41,7 +41,7 @@ class UserPreference < ActiveRecord::Base
end
def []=(attr_name, value)
if attribute_present? attr_name
if has_attribute? attr_name
super
else
h = (read_attribute(:others) || {}).dup