diff app/models/user_preference.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

--- a/app/models/user_preference.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/app/models/user_preference.rb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,12 +21,14 @@
 
   attr_protected :others, :user_id
 
-  def initialize(attributes = nil)
+  before_save :set_others_hash
+  
+  def initialize(attributes=nil, *args)
     super
     self.others ||= {}
   end
 
-  def before_save
+  def set_others_hash
     self.others ||= {}
   end
 
@@ -42,7 +44,7 @@
     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