Merged r10438 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10524 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:32:11 +00:00
parent fe61739108
commit daea57a37c
2 changed files with 16 additions and 1 deletions
@@ -44,7 +44,7 @@ class UserPreference < ActiveRecord::Base
    if attribute_present? attr_name
      super
    else
-      h = read_attribute(:others).dup || {}
+      h = (read_attribute(:others) || {}).dup
      h.update(attr_name => value)
      write_attribute(:others, h)
      value