From 4e64c01a32017ffcc9d18af0537ccfa90a98cd93 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 7 Mar 2012 18:36:47 +0000
Subject: [PATCH] Merged r9139 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9155 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user_preference.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 040efb994..b655f88fe 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -19,7 +19,7 @@ class UserPreference < ActiveRecord::Base
   belongs_to :user
   serialize :others
 
-  attr_protected :others
+  attr_protected :others, :user_id
 
   def initialize(attributes = nil)
     super
-- 
2.39.5